merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c
index 83444cec9c344897fd163520b5fd9842779dc7ca..1647c742b40ad700a06c31d1ba0e86adcc66a776 100644 (file)
--- a/gtk/conversations_ipx.c
+++ b/gtk/conversations_ipx.c
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -29,25 +29,27 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-ipx.h>
 
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        const ipxhdr_t *ipxh=vip;
 
-       add_conversation_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
+       add_conversation_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->fd->rel_ts, SAT_NONE, PT_NONE);
 
        return 1;
 }
@@ -69,21 +71,30 @@ ipx_conversation_init(const char *optarg, void* userdata _U_)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+ipx_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       ipx_conversation_init("conv,ipx",NULL);
+}
+#else
 static void
 ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 {
        ipx_conversation_init("conv,ipx",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_ipx_conversation(void)
 {
        register_stat_cmd_arg("conv,ipx", ipx_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else    
        register_stat_menu_item("IPX", REGISTER_STAT_GROUP_CONVERSATION_LIST,
            ipx_endpoints_cb, NULL, NULL, NULL);
+#endif
 
        register_conversation_table(TRUE, "IPX", "ipx", NULL /*filter*/, ipx_conversation_packet);
 }