merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 2db7163f13d6ced91dd61806339906bb9097e99b..1a0977820e142d16334a09097013153f5f5cd212 100644 (file)
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -71,7 +71,7 @@ remove_child(struct sctp_udata *child, struct sctp_analyse *parent)
 }
 
 static void
-on_destroy(GtkObject *object _U_, gpointer user_data)
+on_destroy(GObject *object _U_, gpointer user_data)
 {
        struct sctp_analyse *u_data;
        guint16 i, j;
@@ -954,7 +954,11 @@ struct sctp_analyse * u_data;
        sctp_set_filter(NULL, u_data);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void sctp_analyse_start(GtkAction *action _U_, gpointer user_data _U_)
+#else
 void sctp_analyse_start(GtkWidget *w _U_, gpointer data _U_)
+#endif
 {
        struct sctp_analyse * u_data;
 
@@ -980,6 +984,9 @@ void sctp_analyse_start(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_sctp_analyse(void)
 {
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
        register_stat_menu_item("S_CTP/Analyse this Association", REGISTER_STAT_GROUP_TELEPHONY,
                               sctp_analyse_start, NULL, NULL, NULL);
+#endif
 }