Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.

It's only used by the GTK+ main menubar code, so put it there.  I guess
the Qt UI either doesn't have such a limit or defines it itself.

Change-Id: I221be506ac40eee33514301db737ef7e22deb7a6
Reviewed-on: https://code.wireshark.org/review/11385
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h
index 8e001d0207a9179181e3e3ecfae2b4dc586fa6c1..867d64dc34b183b5608e63f03671d16073d3d9d6 100644 (file)
--- a/epan/dissector_filters.h
+++ b/epan/dissector_filters.h
@@ -40,8 +40,6 @@ typedef gboolean (*is_filter_valid_func)(packet_info *pinfo);
     Filter needs to be freed after use */
 typedef gchar* (*build_filter_string_func)(packet_info *pinfo);
 
-#define MAX_NUM_COLOR_CONVERSATION_COLORS       10
-
 /** register a dissector filter */
 WS_DLL_PUBLIC void register_conversation_filter(const char *proto_name, const char *display_name,
                                                       is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string);

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index f3b1b3f1fe3b4047d75ff20e81d0612fceeab076..d8bccc9aff9ec5679f010c8fb2e99d6c47b2e837 100644 (file)
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -2828,6 +2828,8 @@ menu_color_dissector_filter_spe_cb(frame_data *fd _U_, epan_dissect_t *edt, gpoi
     return (edt != NULL) ? filter_entry->is_filter_valid(&edt->pi) : FALSE;
 }
 
+#define MAX_NUM_COLOR_CONVERSATION_COLORS       10
+
 static void
 menu_color_conversation_filter(capture_file *cf)
 {