More GUIManager stuff.

svn path=/trunk/; revision=36982

8 files changed, 144 insertions, 14 deletions

diff --git a/gtk/conversations_ncp.c b/gtk/conversations_ncp.c
index 8cbe3f85fb..f41039e6de 100644
--- a/gtk/conversations_ncp.c
+++ b/gtk/conversations_ncp.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -85,8 +85,25 @@ register_tap_listener_ncp_conversation(void)
 {
 	register_stat_cmd_arg("conv,ncp", ncp_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"NCP",                              /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"NCP",                              /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(ncp_endpoints_cb),       /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else    
 	register_stat_menu_item("NCP", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    ncp_endpoints_cb, NULL, NULL, NULL);
+#endif
 
 	register_conversation_table(FALSE, "NCP", "ncp_hdr", NULL /*filter*/, ncp_conversation_packet);
 }
diff --git a/gtk/conversations_rsvp.c b/gtk/conversations_rsvp.c
index 12d233d192..0d1772a71d 100644
--- a/gtk/conversations_rsvp.c
+++ b/gtk/conversations_rsvp.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -85,9 +85,25 @@ register_tap_listener_rsvp_conversation(void)
 {
 	register_stat_cmd_arg("conv,rsvp", rsvp_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"RSVP",                             /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"RSVP",                             /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(rsvp_endpoints_cb),      /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else    
 	register_stat_menu_item("RSVP", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 			       rsvp_endpoints_cb, NULL, NULL, NULL);
-
+#endif
 	register_conversation_table(TRUE, "RSVP", "rsvp", NULL /*filter*/,
 				    rsvp_conversation_packet);
 }
diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c
index 44a7171330..d51148a7c9 100644
--- a/gtk/conversations_sctp.c
+++ b/gtk/conversations_sctp.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -94,8 +94,24 @@ register_tap_listener_sctp_conversation(void)
 {
 	register_stat_cmd_arg("conv,sctp", sctp_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"SCTP",                             /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"SCTP",                             /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(sctp_conversation_cb),   /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else  
 	register_stat_menu_item("SCTP", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    sctp_conversation_cb, NULL, NULL, NULL);
-
+#endif
     register_conversation_table(FALSE, "SCTP", "sctp", NULL /*filter*/, sctp_conversation_packet);
 }
diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 9f30b85aa6..dc40825741 100644
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -84,8 +84,25 @@ register_tap_listener_tcpip_conversation(void)
 {
 	register_stat_cmd_arg("conv,tcp", tcpip_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"TCP (IPv4 & IPv6)",                /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"TCP (IPv4 & IPv6)",                /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(tcpip_conversation_cb),  /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else  
 	register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    tcpip_conversation_cb, NULL, NULL, NULL);
+#endif
 
 	register_conversation_table(FALSE, "TCP", "tcp", NULL /*filter*/, tcpip_conversation_packet);
 }
diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c
index 208d67255f..ceb6e729f0 100644
--- a/gtk/conversations_tr.c
+++ b/gtk/conversations_tr.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -84,8 +84,24 @@ register_tap_listener_tr_conversation(void)
 {
 	register_stat_cmd_arg("conv,tr", tr_conversation_init, NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"Token Ring",                       /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"Token Ring",                       /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(tr_conversation_cb),     /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else  
 	register_stat_menu_item("Token Ring", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    tr_conversation_cb, NULL, NULL, NULL);
-
+#endif
     register_conversation_table(TRUE, "Token Ring", "tr", NULL /*filter*/, tr_conversation_packet);
 }
diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c
index d7d4940732..cb0568c491 100644
--- a/gtk/conversations_udpip.c
+++ b/gtk/conversations_udpip.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -84,8 +84,24 @@ register_tap_listener_udpip_conversation(void)
 {
 	register_stat_cmd_arg("conv,udp", udpip_conversation_init, NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"UDP (IPv4 & IPv6)",                /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"UDP (IPv4 & IPv6)",                /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(udpip_conversation_cb),  /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else  
 	register_stat_menu_item("UDP (IPv4 & IPv6)", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    udpip_conversation_cb, NULL, NULL, NULL);
-
+#endif
     register_conversation_table(FALSE, "UDP", "udp", NULL /*filter*/, udpip_conversation_packet);
 }
diff --git a/gtk/conversations_usb.c b/gtk/conversations_usb.c
index ed440d1eaa..f37952e292 100644
--- a/gtk/conversations_usb.c
+++ b/gtk/conversations_usb.c
@@ -41,7 +41,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)
@@ -81,8 +81,24 @@ register_tap_listener_usb_conversation(void)
 {
 	register_stat_cmd_arg("conv,usb", usb_conversation_init, NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"USB",                              /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"USB",                              /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(usb_endpoints_cb),       /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else    
 	register_stat_menu_item("USB", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    usb_endpoints_cb, NULL, NULL, NULL);
-
+#endif
 	register_conversation_table(TRUE, "USB", "usb", NULL /*filter*/, usb_conversation_packet);
 }
diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c
index 3c5b2662fc..0affa99fab 100644
--- a/gtk/conversations_wlan.c
+++ b/gtk/conversations_wlan.c
@@ -42,7 +42,7 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
-
+#include "gtk/stock_icons.h"
 
 static int
 wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -84,8 +84,24 @@ register_tap_listener_wlan_conversation(void)
 {
 	register_stat_cmd_arg("conv,wlan", wlan_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+	register_stat_menu_item_stock(
+		REGISTER_STAT_GROUP_CONVERSATION_LIST,		/* Group */
+		"/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */
+		"WLAN",                             /* Name */
+		WIRESHARK_STOCK_CONVERSATIONS,      /* stock_id */
+		"WLAN",                             /* label */
+		NULL,                               /* accelerator */
+		NULL,                               /* tooltip */
+		G_CALLBACK(wlan_endpoints_cb),      /* callback */
+		TRUE,                               /* enabled */
+		NULL,                               /* selected_packet_enabled */
+		NULL,                               /* selected_tree_row_enabled */
+		NULL);                              /* callback_data */
+
+#else  
 	register_stat_menu_item("WLAN", REGISTER_STAT_GROUP_CONVERSATION_LIST,
 	    wlan_endpoints_cb, NULL, NULL, NULL);
-
+#endif
 	register_conversation_table(TRUE, "WLAN", "wlan", NULL /*filter*/, wlan_conversation_packet);
 }