rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading

svn path=/trunk/; revision=25086

12 files changed, 27 insertions, 30 deletions

diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c
index c9bd53fa47..05666928dd 100644
--- a/epan/wslua/wslua_gui.c
+++ b/epan/wslua/wslua_gui.c
@@ -81,7 +81,7 @@ WSLUA_FUNCTION wslua_register_menu(lua_State* L) { /*  Register a menu item in o
     gboolean retap = FALSE;
 	register_stat_group_t group = (int)luaL_optnumber(L,WSLUA_OPTARG_register_menu_GROUP,REGISTER_STAT_GROUP_GENERIC);
 
-	if ( group > REGISTER_TOOLS_GROUP_NONE)
+	if ( group > REGISTER_TOOLS_GROUP_UNSORTED)
 		WSLUA_OPTARG_ERROR(register_menu,GROUP,"must be a defined MENU_* (see init.lua)");
 
 	if(!name)
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 88b97442dd..e3f98ce10f 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -282,5 +282,5 @@ void
 register_tap_listener_gtkdhcpstat(void)
 {
 	register_dfilter_stat(&dhcp_stat_dlg, "BOOTP-DHCP",
-	    REGISTER_STAT_GROUP_NONE);
+	    REGISTER_STAT_GROUP_UNSORTED);
 }
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index 74851eb7cf..973fd45a91 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -314,6 +314,6 @@ register_tap_listener_expert_comp(void)
 {
     register_stat_cmd_arg("expert_comp", expert_comp_init,NULL);
     register_stat_menu_item_stock("Expert Info _Composite", 
-        REGISTER_ANALYZE_GROUP_NONE, WIRESHARK_STOCK_EXPERT_INFO,
+        REGISTER_ANALYZE_GROUP_UNSORTED, WIRESHARK_STOCK_EXPERT_INFO,
         expert_comp_dlg_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index dd2697990c..48a834d602 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -588,6 +588,6 @@ register_tap_listener_expert(void)
 {
 	register_stat_cmd_arg("expert", expert_dlg_init,NULL);
 
-	register_stat_menu_item("E_xpert Info", REGISTER_ANALYZE_GROUP_NONE,
+	register_stat_menu_item("E_xpert Info", REGISTER_ANALYZE_GROUP_UNSORTED,
         expert_dlg_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 1ae37d5f7d..3169c4e279 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -672,7 +672,7 @@ register_tap_listener_flow_graph(void)
 {
 	register_stat_cmd_arg("flow_graph",flow_graph_init_tap,NULL);
 	register_stat_menu_item_stock("Flo_w Graph...", 
-        REGISTER_STAT_GROUP_NONE, WIRESHARK_STOCK_FLOW_GRAPH,
+        REGISTER_STAT_GROUP_UNSORTED, WIRESHARK_STOCK_FLOW_GRAPH,
 	    flow_graph_launch, NULL, NULL, NULL);
 	    
 }
diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index c770e9edd8..059f6d20a6 100644
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -1259,11 +1259,11 @@ register_stat_menu_item_stock(
     case(REGISTER_STAT_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/_Endpoint List/"; break;
     case(REGISTER_STAT_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service _Response Time/"; break;
     case(REGISTER_STAT_GROUP_TELEPHONY): toolspath = "/Statistics/"; break;
-    case(REGISTER_STAT_GROUP_NONE): toolspath = "/Statistics/"; break;
-    case(REGISTER_ANALYZE_GROUP_NONE): toolspath = "/Analyze/"; break;
+    case(REGISTER_STAT_GROUP_UNSORTED): toolspath = "/Statistics/"; break;
+    case(REGISTER_ANALYZE_GROUP_UNSORTED): toolspath = "/Analyze/"; break;
     case(REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER): toolspath = "/Analyze/Conversation Filter/"; break;
 #ifdef HAVE_LUA_5_1
-    case(REGISTER_TOOLS_GROUP_NONE): toolspath = "/Tools/"; break;
+    case(REGISTER_TOOLS_GROUP_UNSORTED): toolspath = "/Tools/"; break;
 #endif
     default:
         g_assert(!"no such menu group");
@@ -1386,7 +1386,7 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
             entry->path = node_data->name;
             entry->callback = node_data->callback;
             switch(group) {
-            case(REGISTER_STAT_GROUP_NONE):
+            case(REGISTER_STAT_GROUP_UNSORTED):
                 break;
             case(REGISTER_STAT_GROUP_GENERIC):
                 break;
@@ -1406,12 +1406,12 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
                 entry->item_type = "<StockItem>";
                 entry->extra_data = WIRESHARK_STOCK_TELEPHONY;
                 break;
-            case(REGISTER_ANALYZE_GROUP_NONE):
+            case(REGISTER_ANALYZE_GROUP_UNSORTED):
                 break;
             case(REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER):
                 break;
 #ifdef HAVE_LUA_5_1
-            case(REGISTER_TOOLS_GROUP_NONE):
+            case(REGISTER_TOOLS_GROUP_UNSORTED):
                 break;
 #endif
             default:
@@ -1484,10 +1484,10 @@ void merge_all_tap_menus(GList *node) {
     if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_TELEPHONY)) {
         gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);
     }
-    if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_NONE)) {
+    if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_UNSORTED)) {
         /*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
     }
-    if (merge_tap_menus_layered(node, REGISTER_ANALYZE_GROUP_NONE)) {
+    if (merge_tap_menus_layered(node, REGISTER_ANALYZE_GROUP_UNSORTED)) {
         sep_entry->path = "/Analyze/";
         /*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
     }
@@ -1496,7 +1496,7 @@ void merge_all_tap_menus(GList *node) {
         /*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
     }
 #ifdef HAVE_LUA_5_1
-    if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) {
+    if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_UNSORTED)) {
         /*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
     }
 #endif
diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index 6bcd8f75ab..befdc8d7fb 100644
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -688,6 +688,6 @@ static void mcaststream_launch(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_mcast_stream_dlg(void)
 {
-	register_stat_menu_item("UDP Multicast Streams", REGISTER_STAT_GROUP_NONE,
+	register_stat_menu_item("UDP Multicast Streams", REGISTER_STAT_GROUP_UNSORTED,
 	    mcaststream_launch, NULL, NULL, NULL);
 }
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index 0368ce4742..2a335a242a 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -418,6 +418,6 @@ register_tap_listener_gtkrpcprogs(void)
 {
 	register_stat_cmd_arg("rpc,programs", gtk_rpcprogs_init,NULL);
 
-	register_stat_menu_item("ONC-RPC Programs", REGISTER_STAT_GROUP_NONE,
+	register_stat_menu_item("ONC-RPC Programs", REGISTER_STAT_GROUP_UNSORTED,
 	gtk_rpcprogs_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index 9b6061422c..1f7ad8ec90 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.c
@@ -333,7 +333,7 @@ static void register_gtk_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p
 	cfg->pr->stat_dlg->index = -1;
 	
 	register_dfilter_stat(cfg->pr->stat_dlg, cfg->name,
-	    REGISTER_STAT_GROUP_NONE);
+	    REGISTER_STAT_GROUP_UNSORTED);
 }
 
 static void free_tree_presentation(stats_tree* st) {
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 75ea0805c8..6ca5622a51 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3921,12 +3921,12 @@ static gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epa
 void
 register_tap_listener_tcp_graph(void)
 {
-    register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (Stevens)", REGISTER_STAT_GROUP_NONE,
+    register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (Stevens)", REGISTER_STAT_GROUP_UNSORTED,
         tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(0));
-    register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (tcptrace)", REGISTER_STAT_GROUP_NONE,
+    register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (tcptrace)", REGISTER_STAT_GROUP_UNSORTED,
         tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(1));
-    register_stat_menu_item("TCP Stream Graph/Throughput Graph", REGISTER_STAT_GROUP_NONE,
+    register_stat_menu_item("TCP Stream Graph/Throughput Graph", REGISTER_STAT_GROUP_UNSORTED,
         tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(2));
-    register_stat_menu_item("TCP Stream Graph/Round Trip Time Graph", REGISTER_STAT_GROUP_NONE,
+    register_stat_menu_item("TCP Stream Graph/Round Trip Time Graph", REGISTER_STAT_GROUP_UNSORTED,
         tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(3));
 }
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index 19303c4324..109d8e0628 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -577,6 +577,6 @@ wlanstat_launch (GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_wlanstat (void)
 {
-	register_stat_menu_item ("WLAN Traffic...", REGISTER_STAT_GROUP_NONE, 
+	register_stat_menu_item ("WLAN Traffic...", REGISTER_STAT_GROUP_UNSORTED, 
 				 wlanstat_launch, NULL, NULL, NULL);
 }
diff --git a/stat_menu.h b/stat_menu.h
index d52b4c9353..355bf680a8 100644
--- a/stat_menu.h
+++ b/stat_menu.h
@@ -43,18 +43,15 @@ extern "C" {
 
 /** The menu group this stat should be registered in. */
 typedef enum {
-    REGISTER_STAT_GROUP_NONE,
-    REGISTER_STAT_GROUP_GENERIC,
+	REGISTER_ANALYZE_GROUP_UNSORTED,
+	REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER,
+    REGISTER_STAT_GROUP_UNSORTED,
+    REGISTER_STAT_GROUP_GENERIC,                /* generic function, not specific to a protocol */
     REGISTER_STAT_GROUP_CONVERSATION_LIST,
     REGISTER_STAT_GROUP_ENDPOINT_LIST,
     REGISTER_STAT_GROUP_RESPONSE_TIME,
     REGISTER_STAT_GROUP_TELEPHONY,
-    /* XXX - split into telephony and VoIP? */
-	REGISTER_ANALYZE_GROUP_NONE,
-	REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER
-#ifdef HAVE_LUA_5_1
-	,REGISTER_TOOLS_GROUP_NONE
-#endif
+	REGISTER_TOOLS_GROUP_UNSORTED
 } register_stat_group_t;
 
 #ifdef __cplusplus