Add missing menus.

svn path=/trunk/; revision=38655

5 files changed, 17 insertions, 0 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index b10a102171..f80fcfc875 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -521,8 +521,12 @@ dlg_destroy_cb(GtkWidget *w _U_, gpointer user_data _U_)
 }
 
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void gtk_dcerpcstat_cb(GtkAction *action, gpointer user_data _U_)
+#else
 static void
 gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
+#endif
 {
 	GtkWidget       *dlg_box;
 	GtkWidget       *prog_box,   *prog_label, *prog_combo_box;
@@ -727,6 +731,9 @@ register_tap_listener_gtkdcerpcstat(void)
 {
 	register_stat_cmd_arg("dcerpc,srt,", gtk_dcerpcstat_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
 	register_stat_menu_item("DCE-RPC...", REGISTER_STAT_GROUP_RESPONSE_TIME,
 	    gtk_dcerpcstat_cb, NULL, NULL, NULL);
+#endif
 }
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index 101af4411a..9e574ae023 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -613,7 +613,11 @@ static void register_menu_cb(const char *name,
     mcb->callback_data = callback_data;
     mcb->retap = retap;
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	g_warning("funnel_stat.c This functionality is broken, menu item %s will not be available",name);
+#else
     register_stat_menu_item(name, group, our_menu_callback, NULL, NULL, mcb);
+#endif
 
 }
 
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index 72befc36cb..88dc4a0412 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -186,6 +186,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action, gpointer user_data);
 
 void afp_srt_stat_cb(GtkAction *action, gpointer user_data);
 void camel_srt_cb(GtkAction *action, gpointer user_data);
+void gtk_dcerpcstat_cb(GtkAction *action, gpointer user_data);
 void diameter_srt_cb(GtkAction *action, gpointer user_data);
 void fc_srt_cb(GtkAction *action, gpointer user_data);
 void gtp_srt_cb(GtkAction *action, gpointer user_data);
diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c
index 9a11e0b630..ac9d0b35b9 100644
--- a/gtk/hostlist_fddi.c
+++ b/gtk/hostlist_fddi.c
@@ -94,8 +94,11 @@ register_tap_listener_fddi_hostlist(void)
 {
 	register_stat_cmd_arg("hosts,fddi", gtk_fddi_hostlist_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
 	register_stat_menu_item("FDDI", REGISTER_STAT_GROUP_ENDPOINT_LIST,
 	    gtk_fddi_hostlist_cb, NULL, NULL, NULL);
+#endif;
 
 	register_hostlist_table(TRUE, "FDDI", "fddi", NULL /*filter*/, fddi_hostlist_packet);
 }
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c
index 68edb4c5a0..b83d5244a0 100644
--- a/gtk/main_menubar.c
+++ b/gtk/main_menubar.c
@@ -1220,6 +1220,7 @@ static const char *ui_desc_menubar =
 "        <menuitem name='AFP' action='/Analyze/ServiceResponseTime/AFP'/>\n"
 "        <menuitem name='ONC-RPC' action='/Analyze/ServiceResponseTime/ONC-RPC'/>\n"
 "        <menuitem name='Camel' action='/Analyze/ServiceResponseTime/Camel'/>\n"
+"        <menuitem name='DCE-RPC' action='/Analyze/ServiceResponseTime/DCE-RPC'/>\n"
 "        <menuitem name='Diameter' action='/Analyze/ServiceResponseTime/Diameter'/>\n"
 "        <menuitem name='FibreChannel' action='/Analyze/ServiceResponseTime/FibreChannel'/>\n"
 "        <menuitem name='GTP' action='/Analyze/ServiceResponseTime/GTP'/>\n"
@@ -1682,6 +1683,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Analyze/ServiceResponseTime/ONC-RPC",	WIRESHARK_STOCK_TIME,			"ONC-RPC...",					NULL, NULL,	G_CALLBACK(gtk_rpcstat_cb) },
    { "/Analyze/ServiceResponseTime/AFP",		WIRESHARK_STOCK_TIME,			"AFP...",						NULL, NULL,	G_CALLBACK(afp_srt_stat_cb) },
    { "/Analyze/ServiceResponseTime/Camel",		WIRESHARK_STOCK_TIME,			"Camel...",						NULL, NULL,	G_CALLBACK(camel_srt_cb) },
+   { "/Analyze/ServiceResponseTime/DCE-RPC",	WIRESHARK_STOCK_TIME,			"DCE-RPC...",					NULL, NULL,	G_CALLBACK(gtk_dcerpcstat_cb) },
    { "/Analyze/ServiceResponseTime/Diameter",	WIRESHARK_STOCK_TIME,			"Diameter...",					NULL, NULL,	G_CALLBACK(diameter_srt_cb) },
    { "/Analyze/ServiceResponseTime/FibreChannel",	WIRESHARK_STOCK_TIME,		"Fibre Channel...",				NULL, NULL,	G_CALLBACK(fc_srt_cb) },
    { "/Analyze/ServiceResponseTime/GTP",		WIRESHARK_STOCK_TIME,			"GTP...",						NULL, NULL,	G_CALLBACK(gtp_srt_cb) },