From 8aa3a7b0acadc9fe50387830f3692c8e964b22b3 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Tue, 10 May 2011 05:31:45 +0000
Subject: More GUIManager stuff.

svn path=/trunk/; revision=37035
---
 gtk/conversations_tcpip.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'gtk/conversations_tcpip.c')

diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index dc40825741..38a27095a8 100644
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -42,7 +42,6 @@
 
 #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)
@@ -71,13 +70,19 @@ tcpip_conversation_init(const char *optarg, void* userdata _U_)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+tcpip_conversation_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+	tcpip_conversation_init("conv,tcp",NULL);
+}
+#else
 static void
 tcpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
 {
 	tcpip_conversation_init("conv,tcp",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_tcpip_conversation(void)
@@ -85,20 +90,6 @@ 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);
-- 
cgit v1.2.3