diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-17 15:52:12 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-17 15:52:12 +0000 |
| commit | 6e8b9a1e6bb8bc5636f7c8b7d7832bd367c214ec (patch) | |
| tree | d3dd33eda32d02a759f57425c14cadcfdd505e51 | |
| parent | 6a7508dd1025ebc7b81bb3ef0f632c7a8d4b219e (diff) | |
Fix compilation on when not using MAIN_MENU_USE_UIMANAGER
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38582 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | gtk/menus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 3ba29f9e6e..4e7400f05e 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -121,10 +121,10 @@ static int initialize = TRUE; #ifdef MAIN_MENU_USE_UIMANAGER GtkActionGroup *main_menu_bar_action_group; +static GtkUIManager *ui_manager_main_menubar = NULL; #else static GtkItemFactory *main_menu_factory = NULL; #endif /* MAIN_MENU_USE_UIMANAGER */ -static GtkUIManager *ui_manager_main_menubar = NULL; static GtkUIManager *ui_manager_packet_list_heading = NULL; static GtkUIManager *ui_manager_packet_list_menu = NULL; static GtkUIManager *ui_manager_tree_view_menu = NULL; @@ -4514,6 +4514,7 @@ set_menu_sensitivity_old(const gchar *path, gint val) #endif /* MAIN_MENU_USE_UIMANAGER */ +#ifdef MAIN_MENU_USE_UIMANAGER static void set_menu_object_data_meat(GtkUIManager *ui_manager, const gchar *path, const gchar *key, gpointer data) { @@ -4527,8 +4528,7 @@ set_menu_object_data_meat(GtkUIManager *ui_manager, const gchar *path, const gch #endif } } - -#ifndef MAIN_MENU_USE_UIMANAGER +#else /* MAIN_MENU_USE_UIMANAGER */ static void set_menu_object_data_meat_old(const gchar *path, const gchar *key, gpointer data) { @@ -4538,7 +4538,7 @@ set_menu_object_data_meat_old(const gchar *path, const gchar *key, gpointer data g_object_set_data(G_OBJECT(menu), key, data); } } -#endif +#endif /* MAIN_MENU_USE_UI_MANAGER */ void set_menu_object_data (const gchar *path, const gchar *key, gpointer data) { |