merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c
index 01b96625603559c4f9dd5651466b8a90c388dcf9..11e5bd3a2ef1dda18c3c51aedbd3a845d30b1f82 100644 (file)
--- a/gtk/conversations_fc.c
+++ b/gtk/conversations_fc.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,23 +29,29 @@
 #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 "tap_menu.h"
+
+#include <epan/packet.h>
+#include <epan/stat_cmd_args.h>
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
+#include <epan/conversation.h>
+#include <epan/dissectors/packet-scsi.h>
 #include <epan/dissectors/packet-fc.h>
 
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        const fc_hdr *fchdr=vip;
 
-       add_conversation_table_data((conversations_table *)pct, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
+       add_conversation_table_data((conversations_table *)pct, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->fd->rel_ts, SAT_NONE, PT_NONE);
 
        return 1;
 }
@@ -53,9 +59,9 @@ fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, c
 
 
 static void
-fc_conversation_init(char *optarg)
+fc_conversation_init(const char *optarg, void* userdata _U_)
 {
-       char *filter=NULL;
+       const char *filter=NULL;
 
        if(!strncmp(optarg,"conv,fc,",8)){
                filter=optarg+8;
@@ -67,21 +73,29 @@ fc_conversation_init(char *optarg)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+fc_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       fc_conversation_init("conv,fc",NULL);
+}
+#else
 static void
 fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       fc_conversation_init("conv,fc");
+       fc_conversation_init("conv,fc",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_fc_conversation(void)
 {
-       register_ethereal_tap("conv,fc", fc_conversation_init);
+       register_stat_cmd_arg("conv,fc", fc_conversation_init, NULL);
 
-       register_tap_menu_item("Fibre Channel", REGISTER_TAP_GROUP_CONVERSATION_LIST,
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
+       register_stat_menu_item("Fibre Channel", REGISTER_STAT_GROUP_CONVERSATION_LIST,
            fc_endpoints_cb, NULL, NULL, NULL);
-
+#endif
        register_conversation_table(TRUE, "Fibre Channel", "fc", NULL /*filter*/, fc_conversation_packet);
 }