menus.[hc]:

  set_menu_object_data_old has identical parameters to set_menu_object_data,
  and one was used only in the MAIN_MENU_USE_UIMANAGER case, the other in the
  non MAIN_MENU_USE_UIMANAGER case. Differentiate inside the function code and
  not via the function name.
main_filter_toolbar.c: Unify the set_menu_object_data and
  set_menu_object_data_old as the only difference was the function name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38580 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/main_filter_toolbar.c b/gtk/main_filter_toolbar.c
index 351a40adf05896a01116026ea73d9479e61fb485..3d81fa3d276325d1c8a0a34f10ba68487d4b69b4 100644 (file)
--- a/gtk/main_filter_toolbar.c
+++ b/gtk/main_filter_toolbar.c
@@ -249,9 +249,8 @@ GtkWidget *filter_toolbar_new(void)
     /* Sets the text entry widget pointer as the E_DILTER_TE_KEY data
      * of any widget that ends up calling a callback which needs
      * that text entry pointer */
-#ifdef MAIN_MENU_USE_UIMANAGER
     set_menu_object_data(MENU_BAR_PATH_FILE_OPEN, E_DFILTER_TE_KEY, filter_te);
-    set_menu_object_data(MENU_BAR_PATH_EDIT_COPY_AS_FLT, E_DFILTER_TE_KEY, 
+    set_menu_object_data(MENU_BAR_PATH_EDIT_COPY_AS_FLT, E_DFILTER_TE_KEY,
                          filter_te);
     set_menu_object_data(MENU_BAR_PATH_ANALYZE_DISPLAY_FLT, E_FILT_TE_PTR_KEY,
                          filter_te);
@@ -285,44 +284,7 @@ GtkWidget *filter_toolbar_new(void)
                          filter_te);
     set_menu_object_data(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL, E_DFILTER_TE_KEY,
                          filter_te);
-#else
-    set_menu_object_data_old(MENU_BAR_PATH_FILE_OPEN, E_DFILTER_TE_KEY, filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_EDIT_COPY_AS_FLT, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_DISPLAY_FLT, E_FILT_TE_PTR_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_FOLLOW_TCP_STREAM, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_FOLLOW_UDP_STREAM, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_FOLLOW_SSL_STREAM, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_AND_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_APL_AS_FLT_OR_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_AND_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-    set_menu_object_data_old(MENU_BAR_PATH_ANALYZE_PREP_A_FLT_OR_NOT_SEL, E_DFILTER_TE_KEY,
-                         filter_te);
-#endif /* MAIN_MENU_USE_UIMANAGER */
-       
+
     set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te);
     g_object_set_data(G_OBJECT(popup_menu_object), E_DFILTER_TE_KEY, filter_te);
 

diff --git a/gtk/menus.c b/gtk/menus.c
index a315d498079e0dfe0a5764e259b4e0434f7dc263..3ba29f9e6e0cd6e96ea2b541a4ab4d2b2abe88c2 100644 (file)
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -4538,17 +4538,11 @@ set_menu_object_data_meat_old(const gchar *path, const gchar *key, gpointer data
         g_object_set_data(G_OBJECT(menu), key, data);
     }
 }
-
-
-void
-set_menu_object_data_old (const gchar *path, const gchar *key, gpointer data) {
-
-    set_menu_object_data_meat_old(path, key, data);
-}
 #endif
+
 void
 set_menu_object_data (const gchar *path, const gchar *key, gpointer data) {
-
+#ifdef MAIN_MENU_USE_UIMANAGER
     if (strncmp (path,"/Menubar",8) == 0){
         set_menu_object_data_meat(ui_manager_main_menubar, path, key, data);
     }else if (strncmp (path,"/PacketListMenuPopup",20) == 0){
@@ -4560,6 +4554,9 @@ set_menu_object_data (const gchar *path, const gchar *key, gpointer data) {
     }else if (strncmp (path,"/ProfilesMenuPopup",18) == 0){
         set_menu_object_data_meat(ui_manager_statusbar_profiles_menu, path, key, data);
     }
+#else
+    set_menu_object_data_meat_old(path, key, data);
+#endif
 }
 
 

diff --git a/gtk/menus.h b/gtk/menus.h
index 788fe3098553e4d35f65ed766acbdff48af321d7..3254d8f52a446bcbc50e783e98bf39c967e54748 100644 (file)
--- a/gtk/menus.h
+++ b/gtk/menus.h
@@ -90,9 +90,6 @@ extern GtkWidget *main_menu_new(GtkAccelGroup **accel);
  * @param data the data to set
  */
 extern void set_menu_object_data(const gchar *path, const gchar *key, gpointer data);
-#ifndef MAIN_MENU_USE_UIMANAGER
-extern void set_menu_object_data_old(const gchar *path, const gchar *key, gpointer data);
-#endif /* MAIN_MENU_USE_UIMANAGER */
 
 /** The popup menu handler.
  *