aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/menus.h
diff options
context:
space:
mode:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-08-17 14:35:32 +0000
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-08-17 14:35:32 +0000
commit3c9e9ea82c375865ffc191a623218ee8af4a4b1f (patch)
treef994e497e85e9a7b8407d239d96522925230ae7d /gtk/menus.h
parentbcc4b8d05f441e7f145e486e3090dd71cbac4575 (diff)
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
Diffstat (limited to 'gtk/menus.h')
-rw-r--r--gtk/menus.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/gtk/menus.h b/gtk/menus.h
index 788fe30985..3254d8f52a 100644
--- 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.
*