add details for doxygen, various code cleanups as a result of this

svn path=/trunk/; revision=11052

1 files changed, 82 insertions, 83 deletions

diff --git a/gtk/menu.c b/gtk/menu.c
index 60bf3969ca..1027c187b0 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.198 2004/05/26 03:49:23 ulfl Exp $
+ * $Id: menu.c,v 1.199 2004/06/01 17:33:37 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -197,9 +197,9 @@ static GtkItemFactoryEntry menu_items[] =
                              find_previous_cb, 0, GTK_STOCK_GO_BACK),
     ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, 1, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, 2, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Mark Packet", "<control>M", mark_frame_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, mark_all_frames_cb,
@@ -278,31 +278,31 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
                        0, ETHEREAL_STOCK_DISPLAY_FILTER),
     ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL,
-                       match_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL,
-                       match_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL,
-                       match_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL,
-                       match_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL,
-                       match_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL,
-                       match_selected_cb_or_ptree_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL,
-                       prepare_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL,
-                       prepare_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL,
-                       prepare_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL,
-                       prepare_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL,
-                       prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL,
-                       prepare_selected_cb_or_ptree_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_REPLACE, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_AND, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_AND_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_OR_NOT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
@@ -324,10 +324,6 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP),
     ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-#ifdef HAVE_PLUGINS
-/*    ITEM_FACTORY_ENTRY("/Help/About _Plugins", NULL, tools_plugins_cmd_cb,
-                       0, NULL, NULL),*/
-#endif /* HAVE_PLUGINS */
     ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
                        0, NULL, NULL)
 };
@@ -347,35 +343,37 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Mark Packet", NULL, mark_frame_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, 1, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, 2, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL,
-                       match_selected_cb_replace_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL,
-                       match_selected_cb_not_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL,
-                       match_selected_cb_and_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_cb_or_plist,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL,
-                       match_selected_cb_and_plist_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL,
-                       match_selected_cb_or_plist_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_plist_cb, 
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_plist_cb, 
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_plist_cb, 
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_plist_cb, 
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_plist_cb, 
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
     ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL,
-                       prepare_selected_cb_replace_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL,
-                       prepare_selected_cb_not_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL,
-                       prepare_selected_cb_and_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL,
-                       prepare_selected_cb_or_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL,
-                       prepare_selected_cb_and_plist_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL,
-                       prepare_selected_cb_or_plist_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_REPLACE, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_AND, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_OR, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_AND_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+                       MATCH_SELECTED_OR_NOT, NULL, NULL),
+
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Coloring Rules...", NULL, color_display_cb,
                        0, NULL, NULL),
@@ -399,31 +397,32 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
     ITEM_FACTORY_ENTRY("/Protocol Properties...", NULL, properties_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL,
-                       match_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL,
-                       match_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL,
-                       match_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_cb_or_ptree,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL,
-                       match_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL,
-                       match_selected_cb_or_ptree_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
     ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL,
-                       prepare_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL,
-                       prepare_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL,
-                       prepare_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL,
-                       prepare_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL,
-                       prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL,
-                       prepare_selected_cb_or_ptree_not, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_REPLACE, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_AND, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb, 
+                       MATCH_SELECTED_AND_NOT, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+                       MATCH_SELECTED_OR_NOT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL),