Fix the wireless settings button for AirPCap devices in the
[obnox/wireshark/wip.git] / gtk / conversations_tcpip.c
index dc40825741bd98f7369b76bcf4b5cc029e78ea48..38a27095a84f116574426b35ee71e1a62d37a23b 100644 (file)
@@ -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);