aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2011-08-20 09:55:32 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2011-08-20 09:55:32 +0000
commit572704db874535584c44fc43989ba225f990a718 (patch)
treecfe15bd831659ccd9570d2b4d088208e2172b5e2 /gtk
parent6a8f2bda3bc3f827e4bff1a2700f26b6c92cdbcb (diff)
Make register_dfilter_stat work for MAIN_MENU_USE_UIMANAGER
and add a bunch of menus. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38626 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r--gtk/afp_stat.c7
-rw-r--r--gtk/bootp_stat.c8
-rw-r--r--gtk/camel_counter.c7
-rw-r--r--gtk/camel_srt.c7
-rw-r--r--gtk/diameter_stat.c7
-rw-r--r--gtk/fc_stat.c7
-rw-r--r--gtk/gtp_stat.c7
-rw-r--r--gtk/gui_stat_menu.h14
-rw-r--r--gtk/h225_counter.c7
-rw-r--r--gtk/h225_ras_srt.c7
-rw-r--r--gtk/ldap_stat.c6
-rw-r--r--gtk/mac_lte_stat_dlg.c6
-rw-r--r--gtk/main_menubar.c29
-rw-r--r--gtk/megaco_stat.c14
-rw-r--r--gtk/sctp_chunk_stat.c7
-rw-r--r--gtk/tap_param_dlg.c18
-rw-r--r--gtk/tap_param_dlg.h4
17 files changed, 151 insertions, 11 deletions
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c
index fc5d3608c0..ce61f3ec71 100644
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.c
@@ -216,3 +216,10 @@ register_tap_listener_gtkafpstat(void)
register_dfilter_stat(&afp_stat_dlg, "AFP",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void afp_srt_stat_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &afp_stat_dlg);
+}
+#endif
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index d50ecae3ce..246d208052 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -291,3 +291,11 @@ register_tap_listener_gtkdhcpstat(void)
register_dfilter_stat(&dhcp_stat_dlg, "BOOTP-DHCP",
REGISTER_STAT_GROUP_UNSORTED);
}
+
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void bootp_srt_stat_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &dhcp_stat_dlg);
+}
+#endif
diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c
index 41c1c166ad..dde9817a51 100644
--- a/gtk/camel_counter.c
+++ b/gtk/camel_counter.c
@@ -234,3 +234,10 @@ register_tap_listener_gtk_camelcounter(void)
REGISTER_STAT_GROUP_TELEPHONY);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void camel_counter_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &camel_counter_dlg);
+}
+#endif
diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c
index 18b7c63142..aeaed8b0fc 100644
--- a/gtk/camel_srt.c
+++ b/gtk/camel_srt.c
@@ -250,3 +250,10 @@ register_tap_listener_gtk_camelsrt(void)
register_dfilter_stat(&camel_srt_dlg, "CAMEL",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void camel_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &camel_srt_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/diameter_stat.c b/gtk/diameter_stat.c
index 28ca9cbad4..6c7562c513 100644
--- a/gtk/diameter_stat.c
+++ b/gtk/diameter_stat.c
@@ -238,3 +238,10 @@ register_tap_listener_gtkdiameterstat(void)
register_dfilter_stat(&diameter_stat_dlg, "Diameter",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void diameter_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &diameter_stat_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 288c5a4dd8..875e22d1ed 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -223,3 +223,10 @@ register_tap_listener_gtkfcstat(void)
register_dfilter_stat(&fc_stat_dlg, "Fibre Channel",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void fc_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &fc_stat_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/gtp_stat.c b/gtk/gtp_stat.c
index 5b1b4e31de..ceabfe7e47 100644
--- a/gtk/gtp_stat.c
+++ b/gtk/gtp_stat.c
@@ -241,3 +241,10 @@ register_tap_listener_gtkgtpstat(void)
register_dfilter_stat(&gtp_stat_dlg, "GTP",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void gtp_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &gtp_stat_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index 25e39ea2b6..c535e3498d 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -151,6 +151,7 @@ void mtp3_sum_gtk_sum_cb(GtkAction *action, gpointer user_data);
void rtp_analysis_cb(GtkAction *action, gpointer user_data);
void rtpstream_launch(GtkAction *action, gpointer user_data);
void sctp_analyse_start(GtkAction *action, gpointer user_data);
+void sctp_chunk_counter_cb(GtkAction *action, gpointer user_data);
void sctp_stat_start(GtkAction *action, gpointer user_data);
void gui_iostat_cb(GtkAction *action, gpointer user_data);
@@ -161,6 +162,8 @@ void ansi_a_stat_gtk_bsmap_cb(GtkAction *action, gpointer user_data);
void ansi_a_stat_gtk_dtap_cb(GtkAction *action, gpointer user_data);
void ansi_map_stat_gtk_cb(GtkAction *action, gpointer user_data);
+void camel_counter_cb(GtkAction *action, gpointer user_data);
+void h225_counter_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_bssmap_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action, gpointer user_data);
@@ -171,10 +174,21 @@ void gsm_a_stat_gtk_dtap_sm_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_dtap_ss_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_dtap_tp_cb(GtkAction *action, gpointer user_data);
void gsm_a_stat_gtk_sacch_rr_cb(GtkAction *action, gpointer user_data);
+void mac_lte_stat_cb(GtkAction *action, gpointer user_data);
void gsm_map_stat_gtk_cb(GtkAction *action, gpointer user_data);
void gsm_map_stat_gtk_sum_cb(GtkAction *action, gpointer user_data);
+void afp_srt_stat_cb(GtkAction *action, gpointer user_data);
+void bootp_srt_stat_cb(GtkAction *action, gpointer user_data);
+void camel_srt_cb(GtkAction *action, gpointer user_data);
+void diameter_srt_cb(GtkAction *action, gpointer user_data);
+void fc_srt_cb(GtkAction *action, gpointer user_data);
+void gtp_srt_cb(GtkAction *action, gpointer user_data);
+void h225_srt_cb(GtkAction *action, gpointer user_data);
+void ldap_srt_cb(GtkAction *action, gpointer user_data);
+void megaco_srt_cb(GtkAction *action, gpointer user_data);
+
void tcp_graph_cb (GtkAction *action, gpointer user_data);
gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt, gpointer callback_data _U_);
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 827612fcd0..0e6ba8e926 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -576,3 +576,10 @@ register_tap_listener_gtk_h225counter(void)
register_dfilter_stat(&h225_counter_dlg, "_H.225",
REGISTER_STAT_GROUP_TELEPHONY);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void h225_counter_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &h225_counter_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 41cd12f99b..463b1150b1 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -343,3 +343,10 @@ register_tap_listener_gtk_h225rassrt(void)
register_dfilter_stat(&h225_rassrt_dlg, "H.225 RAS",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void h225_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &h225_rassrt_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 109019fded..af64971090 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -255,3 +255,9 @@ register_tap_listener_gtkldapstat(void)
register_dfilter_stat(&ldap_stat_dlg, "LDAP",
REGISTER_STAT_GROUP_RESPONSE_TIME);
}
+#ifdef MAIN_MENU_USE_UIMANAGER
+void ldap_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &ldap_stat_dlg);
+}
+#endif \ No newline at end of file
diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c
index eb8734e9e0..91c7671446 100644
--- a/gtk/mac_lte_stat_dlg.c
+++ b/gtk/mac_lte_stat_dlg.c
@@ -1321,3 +1321,9 @@ register_tap_listener_mac_lte_stat(void)
register_dfilter_stat(&mac_lte_stat_dlg, "_LTE/_MAC", REGISTER_STAT_GROUP_TELEPHONY);
}
+#ifdef MAIN_MENU_USE_UIMANAGER
+void mac_lte_stat_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &mac_lte_stat_dlg);
+}
+#endif
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c
index 92eb87a4f6..22c5af658b 100644
--- a/gtk/main_menubar.c
+++ b/gtk/main_menubar.c
@@ -1215,8 +1215,17 @@ static const char *ui_desc_menubar =
" <menuitem name='USB' action='/Analyze/ConversationList/USB'/>\n"
" <menuitem name='WLAN' action='/Analyze/ConversationList/WLAN'/>\n"
" </menu>\n"
-" <menu name= 'ServiceResponseTimeMenu' action='/Analyze/ServiceResponseTime'>\n"
+" <menu name='ServiceResponseTimeMenu' action='/Analyze/ServiceResponseTime'>\n"
+" <menuitem name='AFP' action='/Analyze/ServiceResponseTime/AFP'/>\n"
" <menuitem name='ONC-RPC' action='/Analyze/ServiceResponseTime/ONC-RPC'/>\n"
+" <menuitem name='BOOTP-DHCP' action='/Analyze/ServiceResponseTime/BOOTP-DHCP'/>\n"
+" <menuitem name='Camel' action='/Analyze/ServiceResponseTime/Camel'/>\n"
+" <menuitem name='Diameter' action='/Analyze/ServiceResponseTime/Diameter'/>\n"
+" <menuitem name='FibreChannel' action='/Analyze/ServiceResponseTime/FibreChannel'/>\n"
+" <menuitem name='GTP' action='/Analyze/ServiceResponseTime/GTP'/>\n"
+" <menuitem name='H225' action='/Analyze/ServiceResponseTime/H225'/>\n"
+" <menuitem name='LDAP' action='/Analyze/ServiceResponseTime/LDAP'/>\n"
+" <menuitem name='MEGACO' action='/Analyze/ServiceResponseTime/MEGACO'/>\n"
" </menu>\n"
" <separator/>\n"
" <placeholder name='ANCP'/>\n"
@@ -1244,6 +1253,7 @@ static const char *ui_desc_menubar =
" <menuitem name='DTAP' action='/Telephony/ANSI/DTAP'/>\n"
" <menuitem name='MAP-OP' action='/Telephony/ANSI/MAP-OP'/>\n"
" </menu>\n"
+" <menuitem name='H225' action='/Telephony/H225'/>\n"
" <menu name= 'GSM' action='/Telephony/GSM'>\n"
" <menuitem name='BSSMAP' action='/Telephony/GSM/BSSMAP'/>\n"
" <menu name='GSM-DTAP' action='/Telephony/GSM/DTAP'>\n"
@@ -1263,6 +1273,7 @@ static const char *ui_desc_menubar =
" <menu name= 'IAX2menu' action='/Telephony/IAX2'>\n"
" <menuitem name='StreamAnalysis' action='/Telephony/IAX2/StreamAnalysis'/>\n"
" </menu>\n"
+" <menuitem name='LTE_MAC' action='/Telephony/LTE_MAC'/>\n"
" <menu name= 'MTP3menu' action='/Telephony/MTP3'>\n"
" <menuitem name='MSUs' action='/Telephony/MTP3/MSUs'/>\n"
" <menuitem name='MSUSummary' action='/Telephony/MTP3/MSUSummary'/>\n"
@@ -1274,6 +1285,7 @@ static const char *ui_desc_menubar =
" <menu name= 'SCTPmenu' action='/Telephony/SCTP'>\n"
" <menuitem name='AnalysethisAssociation' action='/Telephony/SCTP/AnalysethisAssociation'/>\n"
" <menuitem name='ShowAllAssociations' action='/Telephony/SCTP/ShowAllAssociations'/>\n"
+" <menuitem name='ChunkCounter' action='/Telephony/SCTP/ChunkCounter'/>\n"
" </menu>\n"
" <menuitem name='VoIPCalls' action='/Telephony/VoIPCalls'/>\n"
" </menu>\n"
@@ -1638,6 +1650,15 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Analyze/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL },
{ "/Analyze/ServiceResponseTime/ONC-RPC", WIRESHARK_STOCK_TIME, "ONC-RPC...", NULL, NULL, G_CALLBACK(gtk_rpcstat_cb) },
+ { "/Analyze/ServiceResponseTime/AFP", WIRESHARK_STOCK_TIME, "AFP...", NULL, NULL, G_CALLBACK(afp_srt_stat_cb) },
+ { "/Analyze/ServiceResponseTime/BOOTP-DHCP", WIRESHARK_STOCK_TIME, "BOOTP-DHCP...", NULL, NULL, G_CALLBACK(bootp_srt_stat_cb) },
+ { "/Analyze/ServiceResponseTime/Camel", WIRESHARK_STOCK_TIME, "Camel...", NULL, NULL, G_CALLBACK(camel_srt_cb) },
+ { "/Analyze/ServiceResponseTime/Diameter", WIRESHARK_STOCK_TIME, "Diameter...", NULL, NULL, G_CALLBACK(diameter_srt_cb) },
+ { "/Analyze/ServiceResponseTime/FibreChannel", WIRESHARK_STOCK_TIME, "Fibre Channel...", NULL, NULL, G_CALLBACK(fc_srt_cb) },
+ { "/Analyze/ServiceResponseTime/GTP", WIRESHARK_STOCK_TIME, "GTP...", NULL, NULL, G_CALLBACK(gtp_srt_cb) },
+ { "/Analyze/ServiceResponseTime/H225", WIRESHARK_STOCK_TIME, "H225...", NULL, NULL, G_CALLBACK(h225_srt_cb) },
+ { "/Analyze/ServiceResponseTime/LDAP", WIRESHARK_STOCK_TIME, "LDAP...", NULL, NULL, G_CALLBACK(ldap_srt_cb) },
+ { "/Analyze/ServiceResponseTime/MEGACO", WIRESHARK_STOCK_TIME, "MEGACO...", NULL, NULL, G_CALLBACK(megaco_srt_cb) },
{ "/Analyze/BACnet", NULL, "BACnet", NULL, NULL, NULL },
@@ -1665,7 +1686,10 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Telephony/ANSI/DTAP", NULL, "A-Interface DTAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_dtap_cb) },
{ "/Telephony/ANSI/MAP-OP", NULL, "MAP Operation", NULL, NULL, G_CALLBACK(ansi_map_stat_gtk_cb) },
+ { "/Telephony/H225", NULL, "_H.225...", NULL, NULL, G_CALLBACK(h225_counter_cb) },
+
{ "/Telephony/GSM", NULL, "GSM", NULL, NULL, NULL },
+ { "/Telephony/GSM/CAMEL", NULL, "CAMEL Messages and Response Status", NULL, NULL, G_CALLBACK(camel_counter_cb) },
{ "/Telephony/GSM/BSSMAP", NULL, "_GSM/A-Interface BSSMAP", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) },
{ "/Telephony/GSM/DTAP", NULL, "_GSM/A-Interface DTAP", NULL, NULL, NULL },
@@ -1684,6 +1708,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL },
{ "/Telephony/IAX2/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(iax2_analysis_cb) },
+ { "/Telephony/LTE_MAC", NULL, "_LTE/_MAC...", NULL, NULL, G_CALLBACK(mac_lte_stat_cb) },
{ "/Telephony/MTP3", NULL, "M_TP3", NULL, NULL, NULL },
{ "/Telephony/MTP3/MSUs", NULL, "MSUs", NULL, NULL, G_CALLBACK(mtp3_stat_gtk_cb) },
{ "/Telephony/MTP3/MSUSummary", NULL, "MSU Summary", NULL, NULL, G_CALLBACK(mtp3_sum_gtk_sum_cb) },
@@ -1693,6 +1718,8 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Telephony/SCTP", NULL, "S_CTP", NULL, NULL, NULL },
{ "/Telephony/SCTP/AnalysethisAssociation", NULL, "Analyse this Association", NULL, NULL, G_CALLBACK(sctp_analyse_start) },
{ "/Telephony/SCTP/ShowAllAssociations", NULL, "Show All Associations...", NULL, NULL, G_CALLBACK(sctp_stat_start) },
+ { "/Telephony/SCTP/ChunkCounter", NULL, "Chunk Counter", NULL, NULL, G_CALLBACK(sctp_chunk_counter_cb) },
+
{ "/Telephony/VoIPCalls", WIRESHARK_STOCK_TELEPHONE, "_VoIP Calls", NULL, NULL, G_CALLBACK(voip_calls_launch) },
{ "/Tools/FirewallACLRules", NULL, "Firewall ACL Rules", NULL, NULL, G_CALLBACK(firewall_rule_cb) },
diff --git a/gtk/megaco_stat.c b/gtk/megaco_stat.c
index 1ecc012dd0..ce22411f33 100644
--- a/gtk/megaco_stat.c
+++ b/gtk/megaco_stat.c
@@ -232,9 +232,13 @@ static tap_param_dlg megaco_srt_dlg = {
void
register_tap_listener_gtkmegacostat(void)
{
- /* We don't register this tap, if we don't have the megaco plugin loaded.*/
- if (find_tap_id("megaco")) {
- register_dfilter_stat(&megaco_srt_dlg, "MEGACO",
- REGISTER_STAT_GROUP_RESPONSE_TIME);
- }
+ register_dfilter_stat(&megaco_srt_dlg, "MEGACO",
+ REGISTER_STAT_GROUP_RESPONSE_TIME);
+}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void megaco_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &megaco_srt_dlg);
}
+#endif \ No newline at end of file
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index 0a10fb0424..9f1f4b686f 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -331,3 +331,10 @@ register_tap_listener_sctpstat(void)
register_dfilter_stat(&sctp_stat_dlg, "S_CTP/Chunk Counter",
REGISTER_STAT_GROUP_TELEPHONY);
}
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void sctp_chunk_counter_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+ tap_param_dlg_cb(action, &sctp_stat_dlg);
+}
+#endif
diff --git a/gtk/tap_param_dlg.c b/gtk/tap_param_dlg.c
index 68d5572468..e7d9d8fd5a 100644
--- a/gtk/tap_param_dlg.c
+++ b/gtk/tap_param_dlg.c
@@ -66,9 +66,10 @@ static tap_param_dlg_list_item *start_dlg_list=NULL;
static tap_param_dlg_list_item *end_dlg_list=NULL;
static tap_param_dlg_list_item *current_dlg = NULL;
-static void
-tap_param_dlg_cb(GtkWidget *w, gpointer data);
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
+static void tap_param_dlg_cb(GtkWidget *w, gpointer data);
+#endif
/*
* Register a stat that has a parameter dialog.
* We register it both as a command-line stat and a menu item stat.
@@ -77,10 +78,12 @@ void
register_dfilter_stat(tap_param_dlg *info, const char *name,
register_stat_group_t group)
{
+#ifdef MAIN_MENU_USE_UIMANAGER
+ register_stat_cmd_arg(info->init_string, info->tap_init_cb, NULL);
+#else
char *full_name;
register_stat_cmd_arg(info->init_string, info->tap_init_cb, NULL);
-
/*
* This menu item will pop up a dialog box, so append "..."
* to it.
@@ -89,6 +92,7 @@ register_dfilter_stat(tap_param_dlg *info, const char *name,
register_stat_menu_item(full_name, group, tap_param_dlg_cb, NULL,
NULL, info);
/* tap_menu_item_add() uses the name later on. Leave it allocated. */
+#endif
}
void tap_param_dlg_update (void)
@@ -145,9 +149,13 @@ tap_param_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
g_string_free(params, TRUE);
}
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+tap_param_dlg_cb(GtkAction *action _U_, gpointer data)
+#else
static void
tap_param_dlg_cb(GtkWidget *w _U_, gpointer data)
+#endif
{
const char *filter;
char *title;
diff --git a/gtk/tap_param_dlg.h b/gtk/tap_param_dlg.h
index 1270995ebf..b387f91f3b 100644
--- a/gtk/tap_param_dlg.h
+++ b/gtk/tap_param_dlg.h
@@ -94,6 +94,10 @@ typedef struct _tap_param_dlg {
void register_dfilter_stat(tap_param_dlg *info, const char *name,
register_stat_group_t group);
+#ifdef MAIN_MENU_USE_UIMANAGER
+void tap_param_dlg_cb(GtkAction *action, gpointer user_data);
+#endif
+
/* This will update the titles of the dialog windows when we load a new capture file. */
void tap_param_dlg_update (void);