Have "register_tap_menu_item()" put the item under Tools, not

Tools/Statistics; change the taps to put things under Statistics
themselves.  That allows taps to go elsewhere if appropriate.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8488 f5534014-38df-0310-8fa8-9805f1628bb7

20 files changed, 45 insertions, 45 deletions

diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 49c23f4034..f13864083f 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -1,7 +1,7 @@
 /* bootp_stat.c
  * boop_stat   2003 Jean-Michel FAYARD
  *
- * $Id: bootp_stat.c,v 1.1 2003/09/02 22:47:58 guy Exp $
+ * $Id: bootp_stat.c,v 1.2 2003/09/17 19:39:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -331,5 +331,5 @@ register_tap_listener_gtkdhcpstat(void)
 void
 register_tap_menu_gtkdhcpstat(void)
 {
-	register_tap_menu_item("Watch protocol/BOOTP-DHCP", gtk_dhcpstat_cb);
+	register_tap_menu_item("Statistics/Watch protocol/BOOTP-DHCP", gtk_dhcpstat_cb);
 }
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 1245732a26..603f9eeb46 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.20 2003/09/15 22:16:08 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.21 2003/09/17 19:39:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -579,5 +579,5 @@ register_tap_listener_gtkdcerpcstat(void)
 void
 register_tap_menu_gtkdcerpcstat(void)
 {
-	register_tap_menu_item("Service Response Time/DCE-RPC", gtk_dcerpcstat_cb);
+	register_tap_menu_item("Statistics/Service Response Time/DCE-RPC", gtk_dcerpcstat_cb);
 }
diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c
index ea9638b530..1b09631299 100644
--- a/gtk/endpoint_talkers_eth.c
+++ b/gtk/endpoint_talkers_eth.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_eth.c
  * endpoint_talkers_eth   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_eth.c,v 1.15 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_eth.c,v 1.16 2003/09/17 19:39:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_eth_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_eth_talkers(void)
 {
-	register_tap_menu_item("Conversation List/Ethernet", gtk_eth_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/Ethernet", gtk_eth_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
index c0df014e05..f103eee51a 100644
--- a/gtk/endpoint_talkers_fc.c
+++ b/gtk/endpoint_talkers_fc.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_fc.c
  * endpoint_talkers_fc   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_fc.c,v 1.15 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_fc.c,v 1.16 2003/09/17 19:39:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -82,7 +82,7 @@ gtk_fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_fc_talkers(void)
 {
-	register_tap_menu_item("Conversation List/Fibre Channel", gtk_fc_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/Fibre Channel", gtk_fc_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c
index 5da1bfd9e9..e02ca96d10 100644
--- a/gtk/endpoint_talkers_fddi.c
+++ b/gtk/endpoint_talkers_fddi.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_fddi.c
  * endpoint_talkers_fddi   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_fddi.c,v 1.10 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_fddi.c,v 1.11 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_fddi_talkers(void)
 {
-	register_tap_menu_item("Conversation List/FDDI", gtk_fddi_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/FDDI", gtk_fddi_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c
index e15c9f0df8..e1bd3ea8d5 100644
--- a/gtk/endpoint_talkers_ip.c
+++ b/gtk/endpoint_talkers_ip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_ip.c
  * endpoint_talkers_ip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_ip.c,v 1.16 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_ip.c,v 1.17 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -79,7 +79,7 @@ gtk_ip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_ip_talkers(void)
 {
-	register_tap_menu_item("Conversation List/IPv4", gtk_ip_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/IPv4", gtk_ip_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c
index f76ae9c865..596d24036c 100644
--- a/gtk/endpoint_talkers_ipx.c
+++ b/gtk/endpoint_talkers_ipx.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_ipx.c
  * endpoint_talkers_ipx   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_ipx.c,v 1.14 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_ipx.c,v 1.15 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_ipx_talkers(void)
 {
-	register_tap_menu_item("Conversation List/IPX", gtk_ipx_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/IPX", gtk_ipx_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c
index 539e9f6b2a..a4c2f2f5b4 100644
--- a/gtk/endpoint_talkers_tcpip.c
+++ b/gtk/endpoint_talkers_tcpip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_tcpip.c
  * endpoint_talkers_tcpip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_tcpip.c,v 1.17 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_tcpip.c,v 1.18 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_tcpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_tcpip_talkers(void)
 {
-	register_tap_menu_item("Conversation List/TCP (IPv4 IPv6)", gtk_tcpip_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/TCP (IPv4 IPv6)", gtk_tcpip_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c
index 8abcfb4cb2..9a393ab355 100644
--- a/gtk/endpoint_talkers_tr.c
+++ b/gtk/endpoint_talkers_tr.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_tr.c
  * endpoint_talkers_tr   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_tr.c,v 1.16 2003/09/15 22:32:20 guy Exp $
+ * $Id: endpoint_talkers_tr.c,v 1.17 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_tr_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_tr_talkers(void)
 {
-	register_tap_menu_item("Conversation List/Token Ring", gtk_tr_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/Token Ring", gtk_tr_endpoints_cb);
 }
 
 
diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c
index 8474ef78e2..30c6803cbf 100644
--- a/gtk/endpoint_talkers_udpip.c
+++ b/gtk/endpoint_talkers_udpip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_udpip.c
  * endpoint_talkers_udpip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_udpip.c,v 1.17 2003/09/15 22:32:21 guy Exp $
+ * $Id: endpoint_talkers_udpip.c,v 1.18 2003/09/17 19:39:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ gtk_udpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_menu_udpip_talkers(void)
 {
-	register_tap_menu_item("Conversation List/UDP (IPv4 IPv6)", gtk_udpip_endpoints_cb);
+	register_tap_menu_item("Statistics/Conversation List/UDP (IPv4 IPv6)", gtk_udpip_endpoints_cb);
 }
 
 
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 37fce3ad07..7067400062 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.8 2003/09/15 22:16:08 guy Exp $
+ * $Id: fc_stat.c,v 1.9 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -267,5 +267,5 @@ register_tap_listener_gtkfcstat(void)
 void
 register_tap_menu_gtkfcstat(void)
 {
-	register_tap_menu_item("Service Response Time/Fibre Channel", gtk_fcstat_cb);
+	register_tap_menu_item("Statistics/Service Response Time/Fibre Channel", gtk_fcstat_cb);
 }
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index d23242a723..f03f8c9b88 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -1,7 +1,7 @@
 /* http_stat.c
  * http_stat   2003 Jean-Michel FAYARD
  *
- * $Id: http_stat.c,v 1.2 2003/09/02 23:09:11 guy Exp $
+ * $Id: http_stat.c,v 1.3 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -576,5 +576,5 @@ register_tap_listener_gtkhttpstat(void)
 void
 register_tap_menu_gtkhttpstat(void)
 {
-	register_tap_menu_item("Watch protocol/HTTP", gtk_httpstat_cb);
+	register_tap_menu_item("Statistics/Watch protocol/HTTP", gtk_httpstat_cb);
 }
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 2a0d3eec83..1668bf5c81 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
 /* io_stat.c
  * io_stat   2002 Ronnie Sahlberg
  *
- * $Id: io_stat.c,v 1.26 2003/09/15 22:16:08 guy Exp $
+ * $Id: io_stat.c,v 1.27 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1667,5 +1667,5 @@ register_tap_listener_gtk_iostat(void)
 void
 register_tap_menu_gtkiostat(void)
 {
-	register_tap_menu_item("IO/IO-Stat", gtk_iostat_cb);
+	register_tap_menu_item("Statistics/IO/IO-Stat", gtk_iostat_cb);
 }
diff --git a/gtk/menu.c b/gtk/menu.c
index 6ddf517e0a..7d6edb7908 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.95 2003/09/12 02:48:23 sahlberg Exp $
+ * $Id: menu.c,v 1.96 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -423,7 +423,7 @@ menus_init(void) {
 void
 register_tap_menu_item(char *name, GtkItemFactoryCallback callback)
 {
-	static const char statspath[] = "/Tools/Statistics/";
+	static const char toolspath[] = "/Tools/";
 	char *p;
 	char *menupath;
 	size_t menupathlen;
@@ -447,9 +447,9 @@ register_tap_menu_item(char *name, GtkItemFactoryCallback callback)
 		 *
 		 * Construct the absolute path name of that subtree.
 		 */
-		menupathlen = sizeof statspath + (p - name);
+		menupathlen = sizeof toolspath + (p - name);
 		menupath = g_malloc(menupathlen);
-		strcpy(menupath, statspath);
+		strcpy(menupath, toolspath);
 		strncat(menupath, name, p - name);
 
 		/*
@@ -477,13 +477,13 @@ register_tap_menu_item(char *name, GtkItemFactoryCallback callback)
 	/*
 	 * Construct the main menu path for the menu item.
 	 *
-	 * "sizeof statspath" includes the trailing '\0', so the sum
+	 * "sizeof toolspath" includes the trailing '\0', so the sum
 	 * of that and the length of "name" is enough to hold a string
 	 * containing their concatenation.
 	 */
-	menupathlen = sizeof statspath + strlen(name);
+	menupathlen = sizeof toolspath + strlen(name);
 	menupath = g_malloc(menupathlen);
-	strcpy(menupath, statspath);
+	strcpy(menupath, toolspath);
 	strcat(menupath, name);
 
 	/*
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 69eaa85a68..e3fd437d60 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
  * mgcp-statistics for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: mgcp_stat.c,v 1.12 2003/09/15 22:16:08 guy Exp $
+ * $Id: mgcp_stat.c,v 1.13 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -394,6 +394,6 @@ void
 register_tap_menu_gtkmgcpstat(void)
 {
 	if (find_tap_id("mgcp"))
-		register_tap_menu_item("Service Response Time/MGCP", gtk_mgcpstat_cb);
+		register_tap_menu_item("Statistics/Service Response Time/MGCP", gtk_mgcpstat_cb);
 }
 
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index ac444d9898..678baaade0 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -1,7 +1,7 @@
 /* rpc_progs.c
  * rpc_progs   2002 Ronnie Sahlberg
  *
- * $Id: rpc_progs.c,v 1.9 2003/04/23 08:20:05 guy Exp $
+ * $Id: rpc_progs.c,v 1.10 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -407,6 +407,6 @@ register_tap_listener_gtkrpcprogs(void)
 void
 register_tap_menu_gtkrpcprogs(void)
 {
-	register_tap_menu_item("ONC-RPC/Programs", gtk_rpcprogs_cb);
+	register_tap_menu_item("Statistics/ONC-RPC/Programs", gtk_rpcprogs_cb);
 }
 
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 7e7024967c..83fc7f7d9f 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.19 2003/09/15 22:16:08 guy Exp $
+ * $Id: rpc_stat.c,v 1.20 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -465,5 +465,5 @@ register_tap_listener_gtkrpcstat(void)
 void
 register_tap_menu_gtkrpcstat(void)
 {
-	register_tap_menu_item("Service Response Time/ONC-RPC", gtk_rpcstat_cb);
+	register_tap_menu_item("Statistics/Service Response Time/ONC-RPC", gtk_rpcstat_cb);
 }
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 3a7357981a..a1e3aa4050 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.16 2003/09/15 22:16:08 guy Exp $
+ * $Id: smb_stat.c,v 1.17 2003/09/17 19:39:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -303,5 +303,5 @@ register_tap_listener_gtksmbstat(void)
 void
 register_tap_menu_gtksmbstat(void)
 {
-	register_tap_menu_item("Service Response Time/SMB", gtk_smbstat_cb);
+	register_tap_menu_item("Statistics/Service Response Time/SMB", gtk_smbstat_cb);
 }
diff --git a/gtk/tap_rtp.c b/gtk/tap_rtp.c
index 9bb7506dcb..fa42a3915d 100644
--- a/gtk/tap_rtp.c
+++ b/gtk/tap_rtp.c
@@ -1,7 +1,7 @@
 /*
  * tap_rtp.c
  *
- * $Id: tap_rtp.c,v 1.15 2003/09/06 08:30:26 guy Exp $
+ * $Id: tap_rtp.c,v 1.16 2003/09/17 19:39:33 guy Exp $
  *
  * RTP analysing addition for ethereal
  *
@@ -1575,7 +1575,7 @@ register_tap_listener_gtkrtp(void)
 void
 register_tap_menu_gtkrtp(void)
 {
-	register_tap_menu_item("RTP Analysis...", rtp_analyse_cb);
+	register_tap_menu_item("Statistics/RTP Analysis...", rtp_analyse_cb);
 }
 
 
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index db5a8ea1dd..743fe96001 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -1,7 +1,7 @@
 /* wsp_stat.c
  * wsp_stat   2003 Jean-Michel FAYARD
  *
- * $Id: wsp_stat.c,v 1.1 2003/09/02 22:47:59 guy Exp $
+ * $Id: wsp_stat.c,v 1.2 2003/09/17 19:39:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -479,5 +479,5 @@ register_tap_listener_gtkwspstat(void)
 void
 register_tap_menu_gtkwspstat(void)
 {
-	register_tap_menu_item("Watch protocol/WAP-WSP", gtk_wspstat_cb);
+	register_tap_menu_item("Statistics/Watch protocol/WAP-WSP", gtk_wspstat_cb);
 }