Simplify the ciode a bit.

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

diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index f794aaabbc82b17c9b4266e640914e39f8e6a51c..e1fb7f405d2707b5b48a68f44c42de9b83827931 100644 (file)
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -44,7 +44,6 @@
 
 #include "gtk/gui_stat_menu.h"
 #include "gtk/hostlist_table.h"
-#include "gtk/stock_icons.h"
 
 static int
 ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
@@ -75,13 +74,19 @@ gtk_ip_hostlist_init(const char *optarg, void* userdata _U_)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gtk_ip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       gtk_ip_hostlist_init("hosts,ip",NULL);
+}
+#else
 static void
 gtk_ip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
 {
        gtk_ip_hostlist_init("hosts,ip",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_ip_hostlist(void)
@@ -89,20 +94,6 @@ register_tap_listener_ip_hostlist(void)
        register_stat_cmd_arg("hosts,ip", gtk_ip_hostlist_init,NULL);
 
 #ifdef MAIN_MENU_USE_UIMANAGER
-       register_stat_menu_item_stock(
-               REGISTER_STAT_GROUP_ENDPOINT_LIST,              /* Group */
-               "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */
-               "IPv4",                             /* Name */
-               WIRESHARK_STOCK_ENDPOINTS,          /* stock_id */
-               "IPv4",                             /* label */
-               NULL,                               /* accelerator */
-               NULL,                               /* tooltip */
-               G_CALLBACK(gtk_ip_hostlist_cb),     /* callback */
-               TRUE,                               /* enabled */
-               NULL,                               /* selected_packet_enabled */
-               NULL,                               /* selected_tree_row_enabled */
-               NULL);                              /* callback_data */
-
 #else
        register_stat_menu_item("IPv4", REGISTER_STAT_GROUP_ENDPOINT_LIST,
                gtk_ip_hostlist_cb, NULL, NULL, NULL);