Have "register_dfilter_stat()" add "..." to the menu item, as all menu

items registered with it pop up a dialog box before displaying the stat.
Don't pass a name with "..." to it.

Put "..." into other menu items that pop up a dialog box before
displaying the stat; remove "..." from other menu items that don't.

svn path=/trunk/; revision=15495

8 files changed, 16 insertions, 8 deletions

diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 978baf18b7..056a9147c0 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -559,7 +559,7 @@ void
 register_tap_listener_flow_graph(void)
 {
 	register_stat_cmd_arg("flow_graph",flow_graph_init_tap);
-	register_stat_menu_item("Flow graph", REGISTER_STAT_GROUP_NONE,
+	register_stat_menu_item("Flow graph...", REGISTER_STAT_GROUP_NONE,
 	    flow_graph_launch, NULL, NULL, NULL);
 	    
 }
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 38505d9aba..b82cb051f7 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -562,6 +562,6 @@ gtk_h225counter_init(const char *optarg)
 void
 register_tap_listener_gtk_h225counter(void)
 {
-	register_dfilter_stat(&h225_counter_dlg, "H.225...",
+	register_dfilter_stat(&h225_counter_dlg, "H.225",
 	    REGISTER_STAT_GROUP_TELEPHONY);
 }
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 6e3ea7c81d..35cf7eab61 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -342,6 +342,6 @@ gtk_h225rassrt_init(const char *optarg)
 void
 register_tap_listener_gtk_h225rassrt(void)
 {
-	register_dfilter_stat(&h225_rassrt_dlg, "H.225 RAS...",
+	register_dfilter_stat(&h225_rassrt_dlg, "H.225 RAS",
 	    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 1fc13ff188..2d57132fce 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -326,7 +326,7 @@ register_tap_listener_gtkmgcpstat(void)
 {
 	/* We don't register this tap, if we don't have the mgcp plugin loaded.*/
 	if (find_tap_id("mgcp")) {
-		register_dfilter_stat(&mgcp_srt_dlg, "MGCP...",
+		register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
 		    REGISTER_STAT_GROUP_RESPONSE_TIME);
 	}
 }
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 5d16c3925f..97dd6a1810 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -885,6 +885,6 @@ static void rtpstream_launch(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_rtp_stream_dlg(void)
 {
-	register_stat_menu_item("RTP/Show All Streams...", REGISTER_STAT_GROUP_TELEPHONY,
+	register_stat_menu_item("RTP/Show All Streams", REGISTER_STAT_GROUP_TELEPHONY,
 	    rtpstream_launch, NULL, NULL, NULL);
 }
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 5f937115bb..c0298f3999 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -71,10 +71,18 @@ void
 register_dfilter_stat(tap_dfilter_dlg *info, const char *name,
     REGISTER_STAT_GROUP_E group)
 {
+	char *full_name;
+
 	register_stat_cmd_arg(info->init_string, info->tap_init_cb);
 
-	register_stat_menu_item(name, group, gtk_tap_dfilter_dlg_cb, NULL,
+	/*
+	 * This menu item will pop up a dialog box, so append "..."
+	 * to it.
+	 */
+	full_name = g_strdup_printf("%s...", name);
+	register_stat_menu_item(full_name, group, gtk_tap_dfilter_dlg_cb, NULL,
 	    NULL, info);
+	g_free(full_name);
 }              
 
 void tap_dfilter_dlg_update (void)
diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 69ea75a2f0..7ab19896c1 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -812,7 +812,7 @@ void
 register_tap_listener_voip_calls_dlg(void)
 {
 	register_stat_cmd_arg("voip,calls",voip_calls_init_tap);
-	register_stat_menu_item("VoIP Calls...", REGISTER_STAT_GROUP_TELEPHONY,
+	register_stat_menu_item("VoIP Calls", REGISTER_STAT_GROUP_TELEPHONY,
 	    voip_calls_launch, NULL, NULL, NULL);
 	    
 }
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index e4a0078264..c821a81e89 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -425,6 +425,6 @@ static tap_dfilter_dlg wsp_stat_dlg = {
 void
 register_tap_listener_gtkwspstat(void)
 {
-	register_dfilter_stat(&wsp_stat_dlg, "WAP-WSP...",
+	register_dfilter_stat(&wsp_stat_dlg, "WAP-WSP",
 	    REGISTER_STAT_GROUP_TELEPHONY);
 }