merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index 979b62e8df49fb737da75d2221b8e53b0383a323..0b0ca512994d3810d88b03e5e85eb2314091c2bf 100644 (file)
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -39,12 +39,10 @@
 #include <epan/dissectors/packet-tcp.h>
 
 #include "../stat_menu.h"
-#include "../register.h"
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/hostlist_table.h"
 
-
 static int
 tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
@@ -52,7 +50,7 @@ tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, co
        const struct tcpheader *tcphdr=vip;
 
        /* Take two "add" passes per packet, adding for each direction, ensures that all
-       packets are counted properly (even if address is sending to itself) 
+       packets are counted properly (even if address is sending to itself)
        XXX - this could probably be done more efficiently inside hostlist_table */
        add_hostlist_table_data(hosts, &tcphdr->ip_src, tcphdr->th_sport, TRUE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
        add_hostlist_table_data(hosts, &tcphdr->ip_dst, tcphdr->th_dport, FALSE, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
@@ -77,21 +75,29 @@ gtk_tcpip_hostlist_init(const char *optarg, void* userdata _U_)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gtk_tcpip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       gtk_tcpip_hostlist_init("endpoints,tcp",NULL);
+}
+#else
 static void
 gtk_tcpip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
 {
        gtk_tcpip_hostlist_init("endpoints,tcp",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_tcpip_hostlist(void)
 {
        register_stat_cmd_arg("endpoints,tcp", gtk_tcpip_hostlist_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
        register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_ENDPOINT_LIST,
            gtk_tcpip_hostlist_cb, NULL, NULL, NULL);
-
+#endif
        register_hostlist_table(FALSE, "TCP", "tcp", NULL /*filter*/, tcpip_hostlist_packet);
 }