Do some prep work on GUIManager code, if you enable it it will break as the menus.c changes are not commited.

svn path=/trunk/; revision=36977

4 files changed, 81 insertions, 0 deletions

diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index 7a3b4ac4cc..f5818fc997 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -794,7 +794,23 @@ void
 register_tap_listener_expert_comp(void)
 {
     register_stat_cmd_arg("expert_comp", expert_comp_init,NULL);
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_ANALYZE_GROUP_UNSORTED,    /* Group */
+		"/Menubar/AnalyzeMenu/ExpertInfoComposite",   /* GUI path */
+		"Expert-Info-Composite",            /* Name */
+		WIRESHARK_STOCK_EXPERT_INFO,        /* stock_id */
+		"Expert Info _Composite",           /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(expert_comp_dlg_launch), /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+#else
     register_stat_menu_item_stock("Expert Info _Composite",
         REGISTER_ANALYZE_GROUP_UNSORTED, WIRESHARK_STOCK_EXPERT_INFO,
         expert_comp_dlg_launch, NULL, NULL, NULL);
+#endif
 }
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 0838c4e047..ce9d7b8b51 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -663,19 +663,43 @@ flow_graph_init_tap(const char *dummy _U_, void* userdata _U_)
 
 /****************************************************************************/
 /* entry point when called via the GTK menu */
+#ifdef MAIN_MENU_USE_UIMANAGER
+static void
+flow_graph_launch(GtkAction *action _U_, gpointer user_data _U_)
+{
+	flow_graph_init_tap("",NULL);
+}
+#else
 static void
 flow_graph_launch(GtkWidget *w _U_, gpointer data _U_)
 {
 	flow_graph_init_tap("",NULL);
 }
+#endif
 
 /****************************************************************************/
 void
 register_tap_listener_flow_graph(void)
 {
 	register_stat_cmd_arg("flow_graph",flow_graph_init_tap,NULL);
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_UNSORTED,        /* Group */
+		"/Menubar/StatisticsMenu/FlowGraph", /* GUI path */
+		"Flow-Graph",                        /* Name */
+		WIRESHARK_STOCK_FLOW_GRAPH,          /* stock_id */
+		"Flo_w Graph...",                    /* label */
+		NULL,                                /* accelerator */
+		NULL,                                /* tooltip */
+		G_CALLBACK(flow_graph_launch),       /* callback */
+		TRUE,                                /* enabled */
+		NULL,                                /* selected_packet_enabled */
+		NULL,                                /* selected_tree_row_enabled */
+		NULL);                               /* callback_data */
+#else
 	register_stat_menu_item_stock("Flo_w Graph...",
 				      REGISTER_STAT_GROUP_UNSORTED, WIRESHARK_STOCK_FLOW_GRAPH,
 				      flow_graph_launch, NULL, NULL, NULL);
+#endif
 }
 
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index 1d92b02f2b..e304f21bf8 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -96,6 +96,22 @@ extern void register_stat_menu_item(
  *
  * @param callback_data data for callback function
  */
+//#define MAIN_MENU_USE_UIMANAGER 1
+#ifdef MAIN_MENU_USE_UIMANAGER
+extern void register_stat_menu_item_stock(
+    register_stat_group_t group,
+    const char   *gui_path,
+    const char   *name,
+    const gchar  *stock_id,
+    const char   *label,
+    const char   *accelerator,
+    const gchar  *tooltip,
+    GCallback    callback,
+    gboolean     enabled,
+    gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
+    gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
+    gpointer callback_data);
+#else
 extern void register_stat_menu_item_stock(
     const char *name, 
     register_stat_group_t group,
@@ -104,6 +120,7 @@ extern void register_stat_menu_item_stock(
     gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
     gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
     gpointer callback_data);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 1bea03b89a..e18d9d5c53 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -871,18 +871,42 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_)
 
 /****************************************************************************/
 /* entry point when called via the GTK menu */
+#ifdef MAIN_MENU_USE_UIMANAGER
+static void
+voip_calls_launch(GtkAction *action _U_, gpointer user_data _U_)
+{
+	voip_calls_init_tap("", NULL);
+}
+#else
 static void
 voip_calls_launch(GtkWidget *w _U_, gpointer data _U_)
 {
 	voip_calls_init_tap("", NULL);
 }
+#endif
 
 /****************************************************************************/
 void
 register_tap_listener_voip_calls_dlg(void)
 {
 	register_stat_cmd_arg("voip,calls", voip_calls_init_tap, NULL);
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_TELEPHONY,      /* Group */
+		"/Menubar/TelephonyMenu/VoIPCalls", /* GUI path */
+		"VoIP-Calls",                       /* Name */
+		WIRESHARK_STOCK_TELEPHONE,          /* stock_id */
+		"_VoIP Calls",                      /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(voip_calls_launch),      /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+#else
 	register_stat_menu_item_stock("_VoIP Calls",
 		REGISTER_STAT_GROUP_TELEPHONY, WIRESHARK_STOCK_TELEPHONE,
 		voip_calls_launch, NULL, NULL, NULL);
+#endif
 }