Give the routines that implement the "Match" and "Prepare" menu items

more meaningful names, indicating whether they look at something in the
protocol tree or the packet list.

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

diff --git a/gtk/main.c b/gtk/main.c
index e1388ad6739f5975b8e6650f02846c3cd865df0d..5a1ebf5b03625bc7d061c3ca87b6f1306cfdc644 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.257 2002/08/02 22:34:53 jmayer Exp $
+ * $Id: main.c,v 1.258 2002/08/24 01:17:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -284,7 +284,7 @@ match_selected_cb_do(gpointer data, int action, gchar *text)
 }
 
 void
-match_selected_cb_replace(GtkWidget *w, gpointer data)
+match_selected_cb_replace_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -293,7 +293,7 @@ match_selected_cb_replace(GtkWidget *w, gpointer data)
 }
 
 void
-match_selected_cb_and(GtkWidget *w, gpointer data)
+match_selected_cb_and_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -302,7 +302,7 @@ match_selected_cb_and(GtkWidget *w, gpointer data)
 }
 
 void
-match_selected_cb_or(GtkWidget *w, gpointer data)
+match_selected_cb_or_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -311,7 +311,7 @@ match_selected_cb_or(GtkWidget *w, gpointer data)
 }
 
 void
-match_selected_cb_not(GtkWidget *w, gpointer data)
+match_selected_cb_not_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -320,7 +320,7 @@ match_selected_cb_not(GtkWidget *w, gpointer data)
 }
 
 void
-match_selected_cb_and_not(GtkWidget *w, gpointer data)
+match_selected_cb_and_ptree_not(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -329,7 +329,7 @@ match_selected_cb_and_not(GtkWidget *w, gpointer data)
 }
 
 void
-match_selected_cb_or_not(GtkWidget *w, gpointer data)
+match_selected_cb_or_ptree_not(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -338,7 +338,7 @@ match_selected_cb_or_not(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_replace(GtkWidget *w, gpointer data)
+prepare_selected_cb_replace_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -347,7 +347,7 @@ prepare_selected_cb_replace(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_and(GtkWidget *w, gpointer data)
+prepare_selected_cb_and_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -356,7 +356,7 @@ prepare_selected_cb_and(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_or(GtkWidget *w, gpointer data)
+prepare_selected_cb_or_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -365,7 +365,7 @@ prepare_selected_cb_or(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_not(GtkWidget *w, gpointer data)
+prepare_selected_cb_not_ptree(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -374,7 +374,7 @@ prepare_selected_cb_not(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_and_not(GtkWidget *w, gpointer data)
+prepare_selected_cb_and_ptree_not(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -383,7 +383,7 @@ prepare_selected_cb_and_not(GtkWidget *w, gpointer data)
 }
 
 void
-prepare_selected_cb_or_not(GtkWidget *w, gpointer data)
+prepare_selected_cb_or_ptree_not(GtkWidget *w, gpointer data)
 {
     if (finfo_selected)
        match_selected_cb_do((data ? data : w),
@@ -428,7 +428,7 @@ get_text_from_packet_list(gpointer data)
 }
 
 void
-match_selected_cb_replace2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_replace_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW,
@@ -436,7 +436,7 @@ match_selected_cb_replace2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-match_selected_cb_and2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_and_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW,
@@ -444,7 +444,7 @@ match_selected_cb_and2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-match_selected_cb_or2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_or_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW,
@@ -452,7 +452,7 @@ match_selected_cb_or2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-match_selected_cb_not2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_not_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW,
@@ -460,7 +460,7 @@ match_selected_cb_not2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-match_selected_cb_and_not2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_and_plist_not(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW,
@@ -468,7 +468,7 @@ match_selected_cb_and_not2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-match_selected_cb_or_not2(GtkWidget *w _U_, gpointer data)
+match_selected_cb_or_plist_not(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW,
@@ -476,7 +476,7 @@ match_selected_cb_or_not2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_replace2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_replace_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_REPLACE,
@@ -484,7 +484,7 @@ prepare_selected_cb_replace2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_and2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_and_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_AND,
@@ -492,7 +492,7 @@ prepare_selected_cb_and2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_or2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_or_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_OR,
@@ -500,7 +500,7 @@ prepare_selected_cb_or2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_not2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_not_plist(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_NOT,
@@ -508,7 +508,7 @@ prepare_selected_cb_not2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_and_not2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_and_plist_not(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_AND_NOT,
@@ -516,7 +516,7 @@ prepare_selected_cb_and_not2(GtkWidget *w _U_, gpointer data)
 }
 
 void
-prepare_selected_cb_or_not2(GtkWidget *w _U_, gpointer data)
+prepare_selected_cb_or_plist_not(GtkWidget *w _U_, gpointer data)
 {
     match_selected_cb_do(data,
         MATCH_SELECTED_OR_NOT,

diff --git a/gtk/main.h b/gtk/main.h
index 363a8340fa86e409f4dcd6e9f6023a7848b90fb6..f4e3ed63f7c0ae73000d56005bb6a073a5e1a6e4 100644 (file)
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -1,7 +1,7 @@
 /* main.h
  * Global defines, etc.
  *
- * $Id: main.h,v 1.26 2002/01/11 08:21:02 guy Exp $
+ * $Id: main.h,v 1.27 2002/08/24 01:17:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,30 +61,30 @@ typedef struct _selection_info {
 extern GtkStyle *item_style;
 
 void about_ethereal( GtkWidget *, gpointer);
-void match_selected_cb_replace( GtkWidget *, gpointer);
-void match_selected_cb_and( GtkWidget *, gpointer);
-void match_selected_cb_or( GtkWidget *, gpointer);
-void match_selected_cb_not( GtkWidget *, gpointer);
-void match_selected_cb_and_not( GtkWidget *, gpointer);
-void match_selected_cb_or_not( GtkWidget *, gpointer);
-void prepare_selected_cb_replace( GtkWidget *, gpointer);
-void prepare_selected_cb_and( GtkWidget *, gpointer);
-void prepare_selected_cb_or( GtkWidget *, gpointer);
-void prepare_selected_cb_not( GtkWidget *, gpointer);
-void prepare_selected_cb_and_not( GtkWidget *, gpointer);
-void prepare_selected_cb_or_not( GtkWidget *, gpointer);
-void match_selected_cb_replace2( GtkWidget *, gpointer);
-void match_selected_cb_and2( GtkWidget *, gpointer);
-void match_selected_cb_or2( GtkWidget *, gpointer);
-void match_selected_cb_not2( GtkWidget *, gpointer);
-void match_selected_cb_and_not2( GtkWidget *, gpointer);
-void match_selected_cb_or_not2( GtkWidget *, gpointer);
-void prepare_selected_cb_replace2( GtkWidget *, gpointer);
-void prepare_selected_cb_and2( GtkWidget *, gpointer);
-void prepare_selected_cb_or2( GtkWidget *, gpointer);
-void prepare_selected_cb_not2( GtkWidget *, gpointer);
-void prepare_selected_cb_and_not2( GtkWidget *, gpointer);
-void prepare_selected_cb_or_not2( GtkWidget *, gpointer);
+void match_selected_cb_replace_ptree( GtkWidget *, gpointer);
+void match_selected_cb_and_ptree( GtkWidget *, gpointer);
+void match_selected_cb_or_ptree( GtkWidget *, gpointer);
+void match_selected_cb_not_ptree( GtkWidget *, gpointer);
+void match_selected_cb_and_ptree_not( GtkWidget *, gpointer);
+void match_selected_cb_or_ptree_not( GtkWidget *, gpointer);
+void prepare_selected_cb_replace_ptree( GtkWidget *, gpointer);
+void prepare_selected_cb_and_ptree( GtkWidget *, gpointer);
+void prepare_selected_cb_or_ptree( GtkWidget *, gpointer);
+void prepare_selected_cb_not_ptree( GtkWidget *, gpointer);
+void prepare_selected_cb_and_ptree_not( GtkWidget *, gpointer);
+void prepare_selected_cb_or_ptree_not( GtkWidget *, gpointer);
+void match_selected_cb_replace_plist( GtkWidget *, gpointer);
+void match_selected_cb_and_plist( GtkWidget *, gpointer);
+void match_selected_cb_or_plist( GtkWidget *, gpointer);
+void match_selected_cb_not_plist( GtkWidget *, gpointer);
+void match_selected_cb_and_plist_not( GtkWidget *, gpointer);
+void match_selected_cb_or_plist_not( GtkWidget *, gpointer);
+void prepare_selected_cb_replace_plist( GtkWidget *, gpointer);
+void prepare_selected_cb_and_plist( GtkWidget *, gpointer);
+void prepare_selected_cb_or_plist( GtkWidget *, gpointer);
+void prepare_selected_cb_not_plist( GtkWidget *, gpointer);
+void prepare_selected_cb_and_plist_not( GtkWidget *, gpointer);
+void prepare_selected_cb_or_plist_not( GtkWidget *, gpointer);
 void file_quit_cmd_cb(GtkWidget *, gpointer);
 void file_print_cmd_cb(GtkWidget *, gpointer);
 void file_print_packet_cmd_cb(GtkWidget *, gpointer);

diff --git a/gtk/menu.c b/gtk/menu.c
index 46d97b5a4ac9e8b51b764c930e3be037be2c5cfb..3ed5cf630e6e3cf1309e24c976a6cc2d65b30ff3 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.64 2002/08/02 22:34:54 jmayer Exp $
+ * $Id: menu.c,v 1.65 2002/08/24 01:17:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -140,19 +140,19 @@ static GtkItemFactoryEntry menu_items[] =
   {"/_Display", NULL, NULL, 0, "<Branch>" },
   {"/Display/_Options...", NULL, GTK_MENU_FUNC(display_opt_cb), 0, NULL},
   {"/Display/_Match", NULL, NULL, 0, "<Branch>" },
-  {"/Display/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace), 0, NULL},
-  {"/Display/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not), 0, NULL},
-  {"/Display/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and), 0, NULL},
-  {"/Display/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or), 0, NULL},
-  {"/Display/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_not), 0, NULL},
-  {"/Display/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_not), 0, NULL},
+  {"/Display/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace_ptree), 0, NULL},
+  {"/Display/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not_ptree), 0, NULL},
+  {"/Display/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_ptree), 0, NULL},
+  {"/Display/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_ptree), 0, NULL},
+  {"/Display/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_ptree_not), 0, NULL},
+  {"/Display/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_ptree_not), 0, NULL},
   {"/Display/_Prepare", NULL, NULL, 0, "<Branch>" },
-  {"/Display/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace), 0, NULL},
-  {"/Display/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not), 0, NULL},
-  {"/Display/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and), 0, NULL},
-  {"/Display/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or), 0, NULL},
-  {"/Display/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_not), 0, NULL},
-  {"/Display/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_not), 0, NULL},
+  {"/Display/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace_ptree), 0, NULL},
+  {"/Display/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not_ptree), 0, NULL},
+  {"/Display/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_ptree), 0, NULL},
+  {"/Display/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_ptree), 0, NULL},
+  {"/Display/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_ptree_not), 0, NULL},
+  {"/Display/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_ptree_not), 0, NULL},
   {"/Display/_Colorize Display...", NULL, GTK_MENU_FUNC(color_display_cb), 0, NULL},
   {"/Display/Collapse _All", NULL, GTK_MENU_FUNC(collapse_all_cb), 0, NULL},
   {"/Display/_Expand All", NULL, GTK_MENU_FUNC(expand_all_cb), 0, NULL},
@@ -190,19 +190,19 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
        {"/<separator>", NULL, NULL, 0, "<Separator>"},
        {"/Mark Frame", NULL, GTK_MENU_FUNC(mark_frame_cb), 0, NULL},
         {"/Match", NULL, NULL, 0, "<Branch>" },
-        {"/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace2), 0, NULL},
-        {"/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not2), 0, NULL},
-        {"/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and2), 0, NULL},
-        {"/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or2), 0, NULL},
-        {"/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_not2), 0, NULL},
-        {"/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_not2), 0, NULL},
+        {"/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace_plist), 0, NULL},
+        {"/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not_plist), 0, NULL},
+        {"/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_plist), 0, NULL},
+        {"/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_plist), 0, NULL},
+        {"/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_plist_not), 0, NULL},
+        {"/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_plist_not), 0, NULL},
         {"/Prepare", NULL, NULL, 0, "<Branch>" },
-        {"/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace2), 0, NULL},
-        {"/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not2), 0, NULL},
-        {"/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and2), 0, NULL},
-        {"/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or2), 0, NULL},
-        {"/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_not2), 0, NULL},
-        {"/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_not2), 0, NULL},
+        {"/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace_plist), 0, NULL},
+        {"/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not_plist), 0, NULL},
+        {"/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_plist), 0, NULL},
+        {"/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_plist), 0, NULL},
+        {"/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_plist_not), 0, NULL},
+        {"/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_plist_not), 0, NULL},
        {"/<separator>", NULL, NULL, 0, "<Separator>"},
        {"/Colorize Display...", NULL, GTK_MENU_FUNC(color_display_cb), 0, NULL},
        {"/Print...", NULL, GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL},
@@ -219,19 +219,19 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
        {"/Resolve Name", NULL, GTK_MENU_FUNC(resolve_name_cb), 0, NULL},
        {"/Protocol Properties...", NULL, GTK_MENU_FUNC(properties_cb), 0, NULL},
         {"/Match", NULL, NULL, 0, "<Branch>" },
-        {"/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace), 0, NULL},
-        {"/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not), 0, NULL},
-        {"/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and), 0, NULL},
-        {"/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or), 0, NULL},
-        {"/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_not), 0, NULL},
-        {"/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_not), 0, NULL},
+        {"/Match/_Selected", NULL, GTK_MENU_FUNC(match_selected_cb_replace_ptree), 0, NULL},
+        {"/Match/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_not_ptree), 0, NULL},
+        {"/Match/_And Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_ptree), 0, NULL},
+        {"/Match/_Or Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_ptree), 0, NULL},
+        {"/Match/A_nd Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_and_ptree_not), 0, NULL},
+        {"/Match/O_r Not Selected", NULL, GTK_MENU_FUNC(match_selected_cb_or_ptree_not), 0, NULL},
         {"/Prepare", NULL, NULL, 0, "<Branch>" },
-        {"/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace), 0, NULL},
-        {"/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not), 0, NULL},
-        {"/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and), 0, NULL},
-        {"/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or), 0, NULL},
-        {"/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_not), 0, NULL},
-        {"/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_not), 0, NULL},
+        {"/Prepare/_Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_replace_ptree), 0, NULL},
+        {"/Prepare/_Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_not_ptree), 0, NULL},
+        {"/Prepare/_And Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_ptree), 0, NULL},
+        {"/Prepare/_Or Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_ptree), 0, NULL},
+        {"/Prepare/A_nd Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_and_ptree_not), 0, NULL},
+        {"/Prepare/O_r Not Selected", NULL, GTK_MENU_FUNC(prepare_selected_cb_or_ptree_not), 0, NULL},
        {"/<separator>", NULL, NULL, 0, "<Separator>"},
        {"/Collapse All", NULL, GTK_MENU_FUNC(collapse_all_cb), 0, NULL},
        {"/Expand All", NULL, GTK_MENU_FUNC(expand_all_cb), 0, NULL}