Fix the wireless settings button for AirPCap devices in the

[obnox/wireshark/wip.git] / gtk / conversations_tcpip.c

diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 66a5a59de2e81c88a3d03d39ce06ad5a29816d26..38a27095a84f116574426b35ee71e1a62d37a23b 100644 (file)
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -34,18 +34,15 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 
 #include "../stat_menu.h"
-#include "../register.h"
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/conversations_table.h"
 
-
 static int
 tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
@@ -73,21 +70,30 @@ 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)
 {
        register_stat_cmd_arg("conv,tcp", tcpip_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#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);
 }