replace ITEM_FACTORY_ENTRY and ITEM_FACTORY_STOCK_ENTRY with their required data...

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

diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 7001cb1234f84ada92c5a1224150a788e702f31a..c3989af2ad9589f05571cd7a101f4543143ead32 100644 (file)
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -49,12 +49,6 @@ g_signal_handlers_disconnect_by_func(G_OBJECT(object), func, data)
 #define WIDGET_SET_SIZE(widget, width, height) \
 gtk_widget_set_size_request(GTK_WIDGET(widget), width, height)
 
-#define ITEM_FACTORY_ENTRY(path, accelerator, callback, action, type, data) \
-{path, accelerator, GTK_MENU_FUNC(callback), action, type, data}
-
-#define ITEM_FACTORY_STOCK_ENTRY(path, accelerator, callback, action, data) \
-{path, accelerator, GTK_MENU_FUNC(callback), action, "<StockItem>", data}
-
 #ifdef HAVE_LIBPCAP
 #define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES       "_Interfaces"
 #define WIRESHARK_STOCK_LABEL_CAPTURE_AIRPCAP          "_Wireless"

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 665a4b8811387d6a342ea5d61eb0870f1c257b20..a6377fa8820190eaba3bd659d36bd8f3f5ade201 100644 (file)
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -756,331 +756,331 @@ ct_show_popup_menu_cb(void *widg _U_, GdkEvent *event, conversations_table *ct)
 static GtkItemFactoryEntry ct_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Apply as Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/Not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/Not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/Not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/Not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/Not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/Not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/Not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/Not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+
+       "/Apply as Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/... and Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/... and Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... and Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/... and Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... and Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Apply as Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/... or Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/... or Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... or Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/... or Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... or Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Apply as Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/... and not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/... and not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... and not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/... and not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... and not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/... and not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Apply as Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/... or not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Apply as Filter/... or not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... or not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Apply as Filter/... or not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Apply as Filter/... or not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Apply as Filter/... or not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
-
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Prepare a Filter/Not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/Not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/Not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/Not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/Not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/Not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Prepare a Filter/... and Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/... and Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/... and Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... and Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/... and Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... and Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Prepare a Filter/... or Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/... or Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/... or Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... or Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/... or Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... or Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Prepare a Filter/... and not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/... and not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... and not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
+
+       "/Prepare a Filter/... or not Selected", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/... or not Selected/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Prepare a Filter/... or not Selected/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, DIR_ANY_TO_B), NULL, NULL,
 
        /* Find Packet */
-       ITEM_FACTORY_ENTRY("/Find Packet", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Packet/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Find Packet", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Packet/Find Packet", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Packet/Find Packet/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Packet/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Find Packet/Find Packet/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Find Packet/Find Packet/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Packet/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Find Packet/Find Packet/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Packet/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Packet/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Find Packet/Find Packet/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
        /* Find Next */
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Next/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Find Packet/Find Next", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Packet/Find Next/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Next/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Find Packet/Find Next/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Find Packet/Find Next/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Next/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Find Packet/Find Next/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Next/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Next/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Find Packet/Find Next/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
        /* Find Previous */
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Packet/Find Previous/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Find Packet/Find Previous", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Packet/Find Previous/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Previous/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Find Packet/Find Previous/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Find Packet/Find Previous/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Previous/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Find Packet/Find Previous/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Find Packet/Find Previous/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Find Packet/Find Previous/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Find Packet/Find Previous/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
        /* Colorize Conversation */
-       ITEM_FACTORY_ENTRY("/Colorize Conversation", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A --> B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A <-> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A --> ANY", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/A <-- ANY", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/ANY <-> B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/ANY <-- B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Conversation/ANY --> B", NULL,
-               ct_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL),
+       "/Colorize Conversation", NULL, NULL, 0, "<Branch>", NULL,
+       "/Colorize Conversation/A <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_B), NULL, NULL,
+       "/Colorize Conversation/A --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_B), NULL, NULL,
+       "/Colorize Conversation/A <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_B), NULL, NULL,
+       "/Colorize Conversation/A <-> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_FROM_ANY), NULL, NULL,
+       "/Colorize Conversation/A --> ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_TO_ANY), NULL, NULL,
+       "/Colorize Conversation/A <-- ANY", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_A_FROM_ANY), NULL, NULL,
+       "/Colorize Conversation/ANY <-> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_FROM_B), NULL, NULL,
+       "/Colorize Conversation/ANY <-- B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_FROM_B), NULL, NULL,
+       "/Colorize Conversation/ANY --> B", NULL,
+               GTK_MENU_FUNC(ct_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, DIR_ANY_TO_B), NULL, NULL,
 
 
 };

diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 593a5721cf54fd31f1c6ff1945e575b90e5ac9f9..4ead9d17cb26cbd787393fdc551c5fd81e296ab0 100644 (file)
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -311,86 +311,86 @@ error_show_popup_menu_cb(void *widg _U_, GdkEvent *event, error_equiv_table *err
 static GtkItemFactoryEntry error_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... not Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/.. and Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL,
-               error_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED),
-               NULL, NULL),
+       "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Apply as Filter/... not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
+       "/Apply as Filter/.. and Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED),
+               NULL, NULL,
+       "/Apply as Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED),
+               NULL, NULL,
+       "/Apply as Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED),
+               NULL, NULL,
+       "/Apply as Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED),
+               NULL, NULL,
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL,
-               error_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED),
-               NULL, NULL),
+       "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Prepare a Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
+       "/Prepare a Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED),
+               NULL, NULL,
+       "/Prepare a Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED),
+               NULL, NULL,
+       "/Prepare a Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED),
+               NULL, NULL,
+       "/Prepare a Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED),
+               NULL, NULL,
 
        /* Find Frame */
-       ITEM_FACTORY_ENTRY("/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame/Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame/Not Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
+       "/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Find Frame/Find Frame/Not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
        /* Find Next */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next/Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next/Not Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
+       "/Find Frame/Find Next", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Next/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Find Frame/Find Next/Not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
 
        /* Find Previous */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous/Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous/Not Selected", NULL,
-               error_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
+       "/Find Frame/Find Previous", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Previous/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Find Frame/Find Previous/Not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
 
        /* Colorize Procedure */
-       ITEM_FACTORY_ENTRY("/Colorize Procedure", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Procedure/Selected", NULL,
-               error_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED),
-               NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Procedure/Not Selected", NULL,
-               error_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_NOT_SELECTED),
-               NULL, NULL),
+       "/Colorize Procedure", NULL, NULL, 0, "<Branch>", NULL,
+       "/Colorize Procedure/Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED),
+               NULL, NULL,
+       "/Colorize Procedure/Not Selected", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_NOT_SELECTED),
+               NULL, NULL,
 
        /* Search Internet */
-       ITEM_FACTORY_ENTRY("/Internet Search for Info Text", NULL,
-               error_select_filter_cb, CALLBACK_WEB_LOOKUP, NULL, NULL),
+       "/Internet Search for Info Text", NULL,
+               GTK_MENU_FUNC(error_select_filter_cb), CALLBACK_WEB_LOOKUP, NULL, NULL,
 };
 
 static void

diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 96003dcef5dc322aa830c26522a7389268b12036..80f83363479bdb7d7cdeedcad9e099b1e80b4188 100644 (file)
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -459,48 +459,48 @@ hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et)
 static GtkItemFactoryEntry hostlist_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL,
+       "/Apply as Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Apply as Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL,
-               hostlist_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL,
+       "/Prepare a Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Find Frame */
-       ITEM_FACTORY_ENTRY("/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame", NULL,
-               hostlist_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL,
        /* Find Next */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next", NULL,
-               hostlist_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame/Find Next", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL,
        /* Find Previous */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous", NULL,
-               hostlist_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame/Find Previous", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL,
        /* Colorize Host Traffic */
-       ITEM_FACTORY_ENTRY("/Colorize Host Traffic", NULL,
-               hostlist_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL),
+       "/Colorize Host Traffic", NULL,
+               GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL,
 
 };
 

diff --git a/gtk/menu.c b/gtk/menu.c
index ea68c8a424a711d355cf1c0d7e907482a16e8d29..22cf2636acb451d9bfaf3aa0dd0cb00f850c7d51 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -432,309 +432,310 @@ static gboolean have_items_in_tools_menu = FALSE;
 /* main menu */
 static GtkItemFactoryEntry menu_items[] =
 {
-    ITEM_FACTORY_ENTRY("/_File", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/_Open...", "<control>O", file_open_cmd_cb,
-                             0, GTK_STOCK_OPEN),
-    ITEM_FACTORY_ENTRY("/File/Open _Recent", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/File/_Merge...", NULL, file_merge_cmd_cb, 0, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/_Close", "<control>W", file_close_cmd_cb,
-                             0, GTK_STOCK_CLOSE),
-    ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/_Save", "<control>S", file_save_cmd_cb,
-                             0, GTK_STOCK_SAVE),
-    ITEM_FACTORY_STOCK_ENTRY("/File/Save _As...", "<shift><control>S", file_save_as_cmd_cb,
-                             0, GTK_STOCK_SAVE_AS),
-    ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/File/File Set", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/List Files", NULL, fileset_cb, 0, WIRESHARK_STOCK_FILE_SET_LIST),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Next File", NULL, fileset_next_cb, 0, WIRESHARK_STOCK_FILE_SET_NEXT),
-    ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Previous File", NULL, fileset_previous_cb, 0, WIRESHARK_STOCK_FILE_SET_PREVIOUS),
-    ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
+    "/_File", NULL, NULL, 0, "<Branch>", NULL,
+    "/File/_Open...", "<control>O", GTK_MENU_FUNC(file_open_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_OPEN,
+    "/File/Open _Recent", NULL, NULL, 0, "<Branch>", NULL,
+    "/File/_Merge...", NULL, GTK_MENU_FUNC(file_merge_cmd_cb), 0, NULL, NULL,
+    "/File/_Close", "<control>W", GTK_MENU_FUNC(file_close_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_CLOSE,
+    "/File/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/_Save", "<control>S", GTK_MENU_FUNC(file_save_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_SAVE,
+    "/File/Save _As...", "<shift><control>S", GTK_MENU_FUNC(file_save_as_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_SAVE_AS,
+    "/File/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/File Set", NULL, NULL, 0, "<Branch>", NULL,
+    "/File/File Set/List Files", NULL, GTK_MENU_FUNC(fileset_cb), 0, "<StockItem>", WIRESHARK_STOCK_FILE_SET_LIST,
+    "/File/File Set/Next File", NULL, GTK_MENU_FUNC(fileset_next_cb), 0, "<StockItem>", WIRESHARK_STOCK_FILE_SET_NEXT,
+    "/File/File Set/Previous File", NULL, GTK_MENU_FUNC(fileset_previous_cb), 0, "<StockItem>", WIRESHARK_STOCK_FILE_SET_PREVIOUS,
+    "/File/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/_Export", NULL, NULL, 0, "<Branch>", NULL,
 #if _WIN32
-    ITEM_FACTORY_ENTRY("/File/Export/File...", NULL, export_text_cmd_cb,
-                         0, NULL, NULL),
+    "/File/Export/File...", NULL, GTK_MENU_FUNC(export_text_cmd_cb),
+                         0, NULL, NULL,
 #else
-    ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
-                             0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/as \"_PostScript\" file...", NULL, export_ps_cmd_cb,
-                             0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/as \"_CSV\" (Comma Separated Values packet summary) file...",
-                             NULL, export_csv_cmd_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/as \"C _Arrays\" (packet bytes) file...", NULL, export_carrays_cmd_cb,
-                             0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_SML\" (packet summary) file...", NULL, export_psml_cmd_cb,
-                             0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_DML\" (packet details) file...", NULL, export_pdml_cmd_cb,
-                             0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+    "/File/Export/as \"Plain _Text\" file...", NULL, GTK_MENU_FUNC(export_text_cmd_cb),
+                             0, NULL, NULL,
+    "/File/Export/as \"_PostScript\" file...", NULL, GTK_MENU_FUNC(export_ps_cmd_cb),
+                             0, NULL, NULL,
+    "/File/Export/as \"_CSV\" (Comma Separated Values packet summary) file...",
+                             NULL, GTK_MENU_FUNC(export_csv_cmd_cb), 0, NULL, NULL,
+    "/File/Export/as \"C _Arrays\" (packet bytes) file...", NULL, GTK_MENU_FUNC(export_carrays_cmd_cb),
+                             0, NULL, NULL,
+    "/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/Export/as XML - \"P_SML\" (packet summary) file...", NULL, GTK_MENU_FUNC(export_psml_cmd_cb),
+                             0, NULL, NULL,
+    "/File/Export/as XML - \"P_DML\" (packet details) file...", NULL, GTK_MENU_FUNC(export_pdml_cmd_cb),
+                             0, NULL, NULL,
+    "/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL,
 #endif
-    ITEM_FACTORY_ENTRY("/File/Export/Selected Packet _Bytes...", "<control>H", savehex_cb,
-                             0, NULL, NULL),
+    "/File/Export/Selected Packet _Bytes...", "<control>H", GTK_MENU_FUNC(savehex_cb),
+                             0, NULL, NULL,
 #if GTK_CHECK_VERSION(2,4,0)
-    ITEM_FACTORY_ENTRY("/File/Export/_Objects/_HTTP", NULL, eo_http_cb, 0, NULL,
-                      NULL),
+    "/File/Export/_Objects/_HTTP", NULL, GTK_MENU_FUNC(eo_http_cb), 0, NULL,
+                      NULL,
 #endif
-    ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/_Print...", "<control>P", file_print_cmd_cb,
-                             0, GTK_STOCK_PRINT),
-    ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/File/_Quit", "<control>Q", file_quit_cmd_cb,
-                             0, GTK_STOCK_QUIT),
-    ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Copy", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Copy/As Filter", "<shift><control>C", match_selected_ptree_cb,
-                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL),
+    "/File/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/_Print...", "<control>P", GTK_MENU_FUNC(file_print_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_PRINT,
+    "/File/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/File/_Quit", "<control>Q", GTK_MENU_FUNC(file_quit_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_QUIT,
+    "/_Edit", NULL, NULL, 0, "<Branch>", NULL,
+    "/Edit/Copy", NULL, NULL, 0, "<Branch>", NULL,
+    "/Edit/Copy/As Filter", "<shift><control>C", GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL,
 #if 0
     /* Un-#if this when we actually implement Cut/Copy/Paste. */
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/Cut", "<control>X", NULL,
-                             0, GTK_STOCK_CUT),
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/Copy", "<control>C", NULL,
-                             0, GTK_STOCK_COPY),
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/Paste", "<control>V", NULL,
-                             0, GTK_STOCK_PASTE),
+    "/Edit/Cut", "<control>X", NULL,
+                             0, "<StockItem>", GTK_STOCK_CUT,
+    "/Edit/Copy", "<control>C", NULL,
+                             0, "<StockItem>", GTK_STOCK_COPY,
+    "/Edit/Paste", "<control>V", NULL,
+                             0, "<StockItem>", GTK_STOCK_PASTE,
 #endif
-    ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/_Find Packet...", "<control>F",
-                             find_frame_cb, 0, GTK_STOCK_FIND),
-    ITEM_FACTORY_ENTRY("/Edit/Find Ne_xt", "<control>N", find_next_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Find Pre_vious", "<control>B", find_previous_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/_Mark Packet (toggle)", "<control>M", packet_list_mark_frame_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Find Next Mark", "<shift><control>N", find_next_mark_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Find Previous Mark", "<shift><control>B", find_prev_mark_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, packet_list_mark_all_frames_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/_Unmark All Packets", NULL, packet_list_unmark_all_frames_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/Set Time Reference (toggle)", "<control>T", reftime_frame_cb,
-                        REFTIME_TOGGLE, WIRESHARK_STOCK_TIME),
-    ITEM_FACTORY_ENTRY("/Edit/Find Next Reference", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Find Previous Reference", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/_Configuration Profiles...", "<shift><control>A", profile_dialog_cb, 0, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Edit/_Preferences...", "<shift><control>P", prefs_cb,
-                             0, GTK_STOCK_PREFERENCES),
-    ITEM_FACTORY_ENTRY("/_View", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/View/_Main Toolbar", NULL, main_toolbar_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/_Filter Toolbar", NULL, filter_toolbar_show_cb, 0, "<CheckItem>", NULL),
+    "/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Edit/_Find Packet...", "<control>F",
+                             GTK_MENU_FUNC(find_frame_cb), 0, "<StockItem>", GTK_STOCK_FIND,
+    "/Edit/Find Ne_xt", "<control>N", GTK_MENU_FUNC(find_next_cb), 0, NULL, NULL,
+    "/Edit/Find Pre_vious", "<control>B", GTK_MENU_FUNC(find_previous_cb), 0, NULL, NULL,
+    "/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Edit/_Mark Packet (toggle)", "<control>M", GTK_MENU_FUNC(packet_list_mark_frame_cb),
+                       0, NULL, NULL,
+    "/Edit/Find Next Mark", "<shift><control>N", GTK_MENU_FUNC(find_next_mark_cb),
+                       0, NULL, NULL,
+    "/Edit/Find Previous Mark", "<shift><control>B", GTK_MENU_FUNC(find_prev_mark_cb),
+                       0, NULL, NULL,
+    "/Edit/Mark _All Packets", NULL, GTK_MENU_FUNC(packet_list_mark_all_frames_cb),
+                       0, NULL, NULL,
+    "/Edit/_Unmark All Packets", NULL, GTK_MENU_FUNC(packet_list_unmark_all_frames_cb),
+                       0, NULL, NULL,
+    "/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Edit/Set Time Reference (toggle)", "<control>T", GTK_MENU_FUNC(reftime_frame_cb),
+                        REFTIME_TOGGLE, "<StockItem>", WIRESHARK_STOCK_TIME,
+    "/Edit/Find Next Reference", NULL, GTK_MENU_FUNC(reftime_frame_cb), REFTIME_FIND_NEXT, NULL, NULL,
+    "/Edit/Find Previous Reference", NULL, GTK_MENU_FUNC(reftime_frame_cb), REFTIME_FIND_PREV, NULL, NULL,
+    "/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Edit/_Configuration Profiles...", "<shift><control>A", GTK_MENU_FUNC(profile_dialog_cb), 0, NULL, NULL,
+    "/Edit/_Preferences...", "<shift><control>P", GTK_MENU_FUNC(prefs_cb),
+                             0, "<StockItem>", GTK_STOCK_PREFERENCES,
+    "/_View", NULL, NULL, 0, "<Branch>", NULL,
+    "/View/_Main Toolbar", NULL, GTK_MENU_FUNC(main_toolbar_show_cb), 0, "<CheckItem>", NULL,
+    "/View/_Filter Toolbar", NULL, GTK_MENU_FUNC(filter_toolbar_show_cb), 0, "<CheckItem>", NULL,
 #ifdef HAVE_AIRPCAP
-    ITEM_FACTORY_ENTRY("/View/_Wireless Toolbar", NULL, airpcap_toolbar_show_cb, 0, "<CheckItem>", NULL),
+    "/View/_Wireless Toolbar", NULL, GTK_MENU_FUNC(airpcap_toolbar_show_cb), 0, "<CheckItem>", NULL,
 #endif
-    ITEM_FACTORY_ENTRY("/View/_Statusbar", NULL, statusbar_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Packet _List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Packet _Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Packet _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL, timestamp_absolute_date_cb,
-                        0, "<RadioItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Time of Day:   01:02:03.123456", NULL, timestamp_absolute_cb,
-                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Beginning of Capture:   123.123456", NULL, timestamp_relative_cb,
-                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Captured Packet:   1.123456", NULL, timestamp_delta_cb,
-                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Displayed Packet:   1.123456", NULL, timestamp_delta_dis_cb,
-                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Epoch (1970-01-01):   1234567890.123456", NULL, timestamp_epoch_cb,
-                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Automatic (File Format Precision)", NULL, timestamp_auto_cb,
-                        0, "<RadioItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds:   0", NULL, timestamp_sec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Deciseconds:   0.1", NULL, timestamp_dsec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Centiseconds:   0.12", NULL, timestamp_csec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Milliseconds:   0.123", NULL, timestamp_msec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Microseconds:   0.123456", NULL, timestamp_usec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Time Display Format/Nanoseconds:   0.123456789", NULL, timestamp_nsec_cb,
-                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resol_ution", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resolution/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resolution/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _MAC Layer", NULL, name_resolution_mac_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Network Layer", NULL, name_resolution_network_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Transport Layer", NULL, name_resolution_transport_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Colorize Packet List", NULL, colorize_cb, 0, "<CheckItem>", NULL),
+    "/View/_Statusbar", NULL, GTK_MENU_FUNC(statusbar_show_cb), 0, "<CheckItem>", NULL,
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/Packet _List", NULL, GTK_MENU_FUNC(packet_list_show_cb), 0, "<CheckItem>", NULL,
+    "/View/Packet _Details", NULL, GTK_MENU_FUNC(tree_view_show_cb), 0, "<CheckItem>", NULL,
+    "/View/Packet _Bytes", NULL, GTK_MENU_FUNC(byte_view_show_cb), 0, "<CheckItem>", NULL,
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL,
+    "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL, GTK_MENU_FUNC(timestamp_absolute_date_cb),
+                        0, "<RadioItem>", NULL,
+    "/View/Time Display Format/Time of Day:   01:02:03.123456", NULL, GTK_MENU_FUNC(timestamp_absolute_cb),
+                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL,
+    "/View/Time Display Format/Seconds Since Beginning of Capture:   123.123456", NULL, GTK_MENU_FUNC(timestamp_relative_cb),
+                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL,
+    "/View/Time Display Format/Seconds Since Previous Captured Packet:   1.123456", NULL, GTK_MENU_FUNC(timestamp_delta_cb),
+                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL,
+    "/View/Time Display Format/Seconds Since Previous Displayed Packet:   1.123456", NULL, GTK_MENU_FUNC(timestamp_delta_dis_cb),
+                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL,
+    "/View/Time Display Format/Seconds Since Epoch (1970-01-01):   1234567890.123456", NULL, GTK_MENU_FUNC(timestamp_epoch_cb),
+                        0, "/View/Time Display Format/Date and Time of Day:   1970-01-01 01:02:03.123456", NULL,
+    "/View/Time Display Format/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/Time Display Format/Automatic (File Format Precision)", NULL, GTK_MENU_FUNC(timestamp_auto_cb),
+                        0, "<RadioItem>", NULL,
+    "/View/Time Display Format/Seconds:   0", NULL, GTK_MENU_FUNC(timestamp_sec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Time Display Format/Deciseconds:   0.1", NULL, GTK_MENU_FUNC(timestamp_dsec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Time Display Format/Centiseconds:   0.12", NULL, GTK_MENU_FUNC(timestamp_csec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Time Display Format/Milliseconds:   0.123", NULL, GTK_MENU_FUNC(timestamp_msec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Time Display Format/Microseconds:   0.123456", NULL, GTK_MENU_FUNC(timestamp_usec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Time Display Format/Nanoseconds:   0.123456789", NULL, GTK_MENU_FUNC(timestamp_nsec_cb),
+                        0, "/View/Time Display Format/Automatic (File Format Precision)", NULL,
+    "/View/Name Resol_ution", NULL, NULL, 0, "<Branch>", NULL,
+    "/View/Name Resolution/_Resolve Name", NULL, GTK_MENU_FUNC(resolve_name_cb), 0, NULL, NULL,
+    "/View/Name Resolution/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/Name Resolution/Enable for _MAC Layer", NULL, GTK_MENU_FUNC(name_resolution_mac_cb), 0, "<CheckItem>", NULL,
+    "/View/Name Resolution/Enable for _Network Layer", NULL, GTK_MENU_FUNC(name_resolution_network_cb), 0, "<CheckItem>", NULL,
+    "/View/Name Resolution/Enable for _Transport Layer", NULL, GTK_MENU_FUNC(name_resolution_transport_cb), 0, "<CheckItem>", NULL,
+    "/View/Colorize Packet List", NULL, colorize_cb, 0, "<CheckItem>", NULL,
 #ifdef HAVE_LIBPCAP
-    ITEM_FACTORY_ENTRY("/View/Auto Scroll in Li_ve Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
+    "/View/Auto Scroll in Li_ve Capture", NULL, GTK_MENU_FUNC(auto_scroll_live_cb), 0, "<CheckItem>", NULL,
 #endif
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/View/_Zoom In", "<control>plus", view_zoom_in_cb,
-                             0, GTK_STOCK_ZOOM_IN),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Zoom _Out", "<control>minus", view_zoom_out_cb,
-                             0, GTK_STOCK_ZOOM_OUT),
-    ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
-                             0, GTK_STOCK_ZOOM_100),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Resize All Columns", NULL, packet_list_resize_columns_cb,
-                       0, WIRESHARK_STOCK_RESIZE_COLUMNS),
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/E_xpand Subtrees", "<shift>Right", expand_tree_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/View/_Expand All", "<control>Right", expand_all_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/View/Collapse _All", "<control>Left", collapse_all_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Colorize Conversation", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 1", "<control>1",
-                       colorize_conversation_cb, 1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 2", "<control>2",
-                       colorize_conversation_cb, 2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 3", "<control>3",
-                       colorize_conversation_cb, 3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 4", "<control>4",
-                       colorize_conversation_cb, 4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 5", "<control>5",
-                       colorize_conversation_cb, 5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 6", "<control>6",
-                       colorize_conversation_cb, 6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 7", "<control>7",
-                       colorize_conversation_cb, 7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 8", "<control>8",
-                       colorize_conversation_cb, 8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 9", "<control>9",
-                       colorize_conversation_cb, 9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/Color 10", "<control>0",
-                       colorize_conversation_cb, 10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/View/Colorize Conversation/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/View/Colorize Conversation/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, 0, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/View/Reset Coloring 1-10", "<control>space",
-                       colorize_conversation_cb, 255*256, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb,
-                       0, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-
-    ITEM_FACTORY_ENTRY("/View/Show Packet in New _Window", NULL,
-                       new_window_cb, 0, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/View/_Reload", "<control>R", file_reload_cmd_cb,
-                             0, GTK_STOCK_REFRESH),
-    ITEM_FACTORY_ENTRY("/_Go", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/_Back", "<alt>Left",
-                             history_back_cb, 0, GTK_STOCK_GO_BACK),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/_Forward", "<alt>Right",
-                             history_forward_cb, 0, GTK_STOCK_GO_FORWARD),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/_Go to Packet...", "<control>G",
-                             goto_frame_cb, 0, GTK_STOCK_JUMP_TO),
-    ITEM_FACTORY_ENTRY("/Go/Go to _Corresponding Packet", NULL, goto_framenum_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Go/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/Previous Packet", "<control>Up",
-                             packet_list_prev, 0, GTK_STOCK_GO_UP),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/Next Packet", "<control>Down",
-                             packet_list_next, 0, GTK_STOCK_GO_DOWN),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/F_irst Packet", NULL,
-                             goto_top_frame_cb, 0, GTK_STOCK_GOTO_TOP),
-    ITEM_FACTORY_STOCK_ENTRY("/Go/_Last Packet", NULL,
-                             goto_bottom_frame_cb, 0, GTK_STOCK_GOTO_BOTTOM),
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/_Zoom In", "<control>plus", GTK_MENU_FUNC(view_zoom_in_cb),
+                             0, "<StockItem>", GTK_STOCK_ZOOM_IN,
+    "/View/Zoom _Out", "<control>minus", GTK_MENU_FUNC(view_zoom_out_cb),
+                             0, "<StockItem>", GTK_STOCK_ZOOM_OUT,
+    "/View/_Normal Size", "<control>equal", GTK_MENU_FUNC(view_zoom_100_cb),
+                             0, "<StockItem>", GTK_STOCK_ZOOM_100,
+    "/View/Resize All Columns", NULL, GTK_MENU_FUNC(packet_list_resize_columns_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/E_xpand Subtrees", "<shift>Right", GTK_MENU_FUNC(expand_tree_cb), 0, NULL, NULL,
+    "/View/_Expand All", "<control>Right", GTK_MENU_FUNC(expand_all_cb),
+                       0, NULL, NULL,
+    "/View/Collapse _All", "<control>Left", GTK_MENU_FUNC(collapse_all_cb),
+                       0, NULL, NULL,
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/View/Colorize Conversation", NULL, NULL, 0, "<Branch>",NULL,
+    "/View/Colorize Conversation/Color 1", "<control>1",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/View/Colorize Conversation/Color 2", "<control>2",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/View/Colorize Conversation/Color 3", "<control>3",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/View/Colorize Conversation/Color 4", "<control>4",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/View/Colorize Conversation/Color 5", "<control>5",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/View/Colorize Conversation/Color 6", "<control>6",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/View/Colorize Conversation/Color 7", "<control>7",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/View/Colorize Conversation/Color 8", "<control>8",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/View/Colorize Conversation/Color 9", "<control>9",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/View/Colorize Conversation/Color 10", "<control>0",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/View/Colorize Conversation/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/View/Colorize Conversation/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), 0, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/View/Reset Coloring 1-10", "<control>space",
+                       GTK_MENU_FUNC(colorize_conversation_cb), 255*256, NULL, NULL,
+    "/View/_Coloring Rules...", NULL, color_display_cb,
+                       0, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/View/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+
+    "/View/Show Packet in New _Window", NULL,
+                       GTK_MENU_FUNC(new_window_cb), 0, NULL, NULL,
+    "/View/_Reload", "<control>R", GTK_MENU_FUNC(file_reload_cmd_cb),
+                             0, "<StockItem>", GTK_STOCK_REFRESH,
+    "/_Go", NULL, NULL, 0, "<Branch>", NULL,
+    "/Go/_Back", "<alt>Left",
+                             GTK_MENU_FUNC(history_back_cb), 0, "<StockItem>", GTK_STOCK_GO_BACK,
+    "/Go/_Forward", "<alt>Right",
+                             GTK_MENU_FUNC(history_forward_cb), 0, "<StockItem>", GTK_STOCK_GO_FORWARD,
+    "/Go/_Go to Packet...", "<control>G",
+                             GTK_MENU_FUNC(goto_frame_cb), 0, "<StockItem>", GTK_STOCK_JUMP_TO,
+    "/Go/Go to _Corresponding Packet", NULL, GTK_MENU_FUNC(goto_framenum_cb),
+                       0, NULL, NULL,
+    "/Go/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Go/Previous Packet", "<control>Up",
+                             GTK_MENU_FUNC(packet_list_prev), 0, "<StockItem>", GTK_STOCK_GO_UP,
+    "/Go/Next Packet", "<control>Down",
+                             GTK_MENU_FUNC(packet_list_next), 0, "<StockItem>", GTK_STOCK_GO_DOWN,
+    "/Go/F_irst Packet", NULL,
+                             GTK_MENU_FUNC(goto_top_frame_cb), 0, "<StockItem>", GTK_STOCK_GOTO_TOP,
+    "/Go/_Last Packet", NULL,
+                             GTK_MENU_FUNC(goto_bottom_frame_cb), 0, "<StockItem>", GTK_STOCK_GOTO_BOTTOM,
 #ifdef HAVE_LIBPCAP
-    ITEM_FACTORY_ENTRY("/_Capture", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/_Interfaces...", NULL,
-                             capture_if_cb, 0, WIRESHARK_STOCK_CAPTURE_INTERFACES),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/_Options...", "<control>K",
-                             capture_prep_cb, 0, WIRESHARK_STOCK_CAPTURE_OPTIONS),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/_Start", NULL,
-                             capture_start_cb, 0, WIRESHARK_STOCK_CAPTURE_START),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/S_top", "<control>E", capture_stop_cb,
-                             0, WIRESHARK_STOCK_CAPTURE_STOP),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/_Restart", NULL, capture_restart_cb,
-                             0, WIRESHARK_STOCK_CAPTURE_RESTART),
-    ITEM_FACTORY_STOCK_ENTRY("/Capture/Capture _Filters...", NULL, cfilter_dialog_cb,
-                       0, WIRESHARK_STOCK_CAPTURE_FILTER),
+    "/_Capture", NULL, NULL, 0, "<Branch>", NULL,
+    "/Capture/_Interfaces...", NULL,
+                             GTK_MENU_FUNC(capture_if_cb), 0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_INTERFACES,
+    "/Capture/_Options...", "<control>K",
+                             GTK_MENU_FUNC(capture_prep_cb), 0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_OPTIONS,
+    "/Capture/_Start", NULL,
+                             GTK_MENU_FUNC(capture_start_cb), 0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_START,
+    "/Capture/S_top", "<control>E", GTK_MENU_FUNC(capture_stop_cb),
+                             0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_STOP,
+    "/Capture/_Restart", NULL, GTK_MENU_FUNC(capture_restart_cb),
+                             0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_RESTART,
+    "/Capture/Capture _Filters...", NULL, GTK_MENU_FUNC(cfilter_dialog_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_CAPTURE_FILTER,
 #endif /* HAVE_LIBPCAP */
-    ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
-                       0, WIRESHARK_STOCK_DISPLAY_FILTER),
-    ITEM_FACTORY_ENTRY("/Analyze/Display Filter _Macros...", NULL, macros_dialog_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", 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, 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/Firewall ACL Rules", NULL,
-                       firewall_rule_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, WIRESHARK_STOCK_CHECKBOX),
-    ITEM_FACTORY_STOCK_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
-                       0, WIRESHARK_STOCK_DECODE_AS),
-    ITEM_FACTORY_STOCK_ENTRY("/Analyze/_User Specified Decodes...", NULL,
-                       decode_show_cb, 0, WIRESHARK_STOCK_DECODE_AS),
-    ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
-                       follow_tcp_stream_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/_Follow UDP Stream", NULL,
-                       follow_udp_stream_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/_Follow SSL Stream", NULL,
-                       follow_ssl_stream_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, GTK_STOCK_PROPERTIES),
-    ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
-                       proto_hier_stats_cb, 0, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Statistics/Conversations", NULL,
-                       init_conversation_notebook_cb, 0, WIRESHARK_STOCK_CONVERSATIONS),
-    ITEM_FACTORY_STOCK_ENTRY("/Statistics/Endpoints", NULL,
-                       init_hostlist_notebook_cb, 0, WIRESHARK_STOCK_ENDPOINTS),
+    "/_Analyze", NULL, NULL, 0, "<Branch>", NULL,
+    "/Analyze/_Display Filters...", NULL, GTK_MENU_FUNC(dfilter_dialog_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_DISPLAY_FILTER,
+    "/Analyze/Display Filter _Macros...", NULL, GTK_MENU_FUNC(macros_dialog_cb), 0, NULL, NULL,
+    "/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Analyze/Apply as Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/Apply as Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/Apply as Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/Apply as Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/Apply as Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/Apply as Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Analyze/Prepare a Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_REPLACE, NULL, NULL,
+    "/Analyze/Prepare a Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_NOT, NULL, NULL,
+    "/Analyze/Prepare a Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND, NULL, NULL,
+    "/Analyze/Prepare a Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR, NULL, NULL,
+    "/Analyze/Prepare a Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND_NOT, NULL, NULL,
+    "/Analyze/Prepare a Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR_NOT, NULL, NULL,
+    "/Analyze/Firewall ACL Rules", NULL,
+                       firewall_rule_cb, 0, NULL, NULL,
+    "/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Analyze/_Enabled Protocols...", "<shift><control>R", GTK_MENU_FUNC(proto_cb), 
+                       0, "<StockItem>", WIRESHARK_STOCK_CHECKBOX,
+    "/Analyze/Decode _As...", NULL, GTK_MENU_FUNC(decode_as_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,
+    "/Analyze/_User Specified Decodes...", NULL,
+                       GTK_MENU_FUNC(decode_show_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,
+    "/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Analyze/_Follow TCP Stream", NULL,
+                       GTK_MENU_FUNC(follow_tcp_stream_cb), 0, NULL, NULL,
+    "/Analyze/_Follow UDP Stream", NULL,
+                       GTK_MENU_FUNC(follow_udp_stream_cb), 0, NULL, NULL,
+    "/Analyze/_Follow SSL Stream", NULL,
+                       GTK_MENU_FUNC(follow_ssl_stream_cb), 0, NULL, NULL,
+    "/_Statistics", NULL, NULL, 0, "<Branch>", NULL,
+    "/Statistics/_Summary", NULL, GTK_MENU_FUNC(summary_open_cb), 0, "<StockItem>", GTK_STOCK_PROPERTIES,
+    "/Statistics/_Protocol Hierarchy", NULL,
+                       GTK_MENU_FUNC(proto_hier_stats_cb), 0, NULL, NULL,
+    "/Statistics/Conversations", NULL,
+                       GTK_MENU_FUNC(init_conversation_notebook_cb), 0, "<StockItem>", WIRESHARK_STOCK_CONVERSATIONS,
+    "/Statistics/Endpoints", NULL,
+                       GTK_MENU_FUNC(init_hostlist_notebook_cb), 0, "<StockItem>", WIRESHARK_STOCK_ENDPOINTS,
 #ifdef HAVE_LUA_5_1
-    ITEM_FACTORY_ENTRY("/_Tools", NULL, NULL, 0, "<Branch>", NULL),
+    "/_Tools", NULL, NULL, 0, "<Branch>", NULL,
 #endif
-    ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP),
-    ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/TShark", NULL, topic_menu_cb, LOCALPAGE_MAN_TSHARK, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/RawShark", NULL, topic_menu_cb, LOCALPAGE_MAN_RAWSHARK, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Dumpcap", NULL, topic_menu_cb, LOCALPAGE_MAN_DUMPCAP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Mergecap", NULL, topic_menu_cb, LOCALPAGE_MAN_MERGECAP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Editcap", NULL, topic_menu_cb, LOCALPAGE_MAN_EDITCAP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, topic_menu_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Wireshark Online", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/Home Page", NULL, topic_menu_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/Wiki", NULL, topic_menu_cb, ONLINEPAGE_WIKI, WIRESHARK_STOCK_WIKI),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/Wireshark Online/User's Guide", NULL, topic_menu_cb, ONLINEPAGE_USERGUIDE, WIRESHARK_STOCK_WEB_SUPPORT),
-    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/FAQ's", NULL, topic_menu_cb, ONLINEPAGE_FAQ, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/Downloads", NULL, topic_menu_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Wireshark Online/Example Files", NULL, topic_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Help/_About Wireshark", NULL, about_wireshark_cb,
-                       0, WIRESHARK_STOCK_ABOUT)
+    "/_Help", NULL, NULL, 0, "<Branch>", NULL,
+    "/Help/_Contents", "F1", GTK_MENU_FUNC(topic_menu_cb), HELP_CONTENT, "<StockItem>", GTK_STOCK_HELP,
+    "/Help/_Supported Protocols", NULL, GTK_MENU_FUNC(supported_cb), 0, NULL, NULL,
+    "/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL,
+    "/Help/Manual Pages/Wireshark", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_WIRESHARK, NULL, NULL,
+    "/Help/Manual Pages/Wireshark Filter", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL,
+    "/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Help/Manual Pages/TShark", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_TSHARK, NULL, NULL,
+    "/Help/Manual Pages/RawShark", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_RAWSHARK, NULL, NULL,
+    "/Help/Manual Pages/Dumpcap", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_DUMPCAP, NULL, NULL,
+    "/Help/Manual Pages/Mergecap", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_MERGECAP, NULL, NULL,
+    "/Help/Manual Pages/Editcap", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_EDITCAP, NULL, NULL,
+    "/Help/Manual Pages/Text2pcap", NULL, GTK_MENU_FUNC(topic_menu_cb), LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL,
+    "/Help/Wireshark Online", NULL, NULL, 0, "<Branch>", NULL,
+    "/Help/Wireshark Online/Home Page", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_HOME, "<StockItem>", GTK_STOCK_HOME,
+    "/Help/Wireshark Online/Wiki", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_WIKI, "<StockItem>", WIRESHARK_STOCK_WIKI,
+    "/Help/Wireshark Online/User's Guide", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_USERGUIDE, "<StockItem>", WIRESHARK_STOCK_WEB_SUPPORT,
+    "/Help/Wireshark Online/FAQ's", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_FAQ, NULL, NULL,
+    "/Help/Wireshark Online/Downloads", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_DOWNLOAD, NULL, NULL,
+    "/Help/Wireshark Online/Example Files", NULL, GTK_MENU_FUNC(topic_menu_cb), ONLINEPAGE_SAMPLE_FILES, NULL, NULL,
+    "/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Help/_About Wireshark", NULL, GTK_MENU_FUNC(about_wireshark_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_ABOUT
 };
 
 
@@ -744,306 +745,306 @@ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
 /* packet list popup */
 static GtkItemFactoryEntry packet_list_menu_items[] =
 {
-    ITEM_FACTORY_ENTRY("/Mark Packet (toggle)", NULL, packet_list_mark_frame_cb, 0, NULL, NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, WIRESHARK_STOCK_TIME),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", 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, 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("/Conversation Filter", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_ENTRY("/Conversation Filter/Ethernet", NULL, conversation_cb,
-                       CONV_ETHER, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Conversation Filter/IP", NULL, conversation_cb,
-                       CONV_IP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Conversation Filter/TCP", NULL, conversation_cb,
-                       CONV_TCP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Conversation Filter/UDP", NULL, conversation_cb,
-                       CONV_UDP, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Conversation Filter/PN-CBA Server", NULL, conversation_cb,
-                       CONV_CBA, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/Colorize Conversation", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/Ethernet", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 1", NULL,
-                       colorize_conversation_cb, CONV_ETHER+1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 2", NULL,
-                       colorize_conversation_cb, CONV_ETHER+2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 3", NULL,
-                       colorize_conversation_cb, CONV_ETHER+3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 4", NULL,
-                       colorize_conversation_cb, CONV_ETHER+4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 5", NULL,
-                       colorize_conversation_cb, CONV_ETHER+5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 6", NULL,
-                       colorize_conversation_cb, CONV_ETHER+6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 7", NULL,
-                       colorize_conversation_cb, CONV_ETHER+7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 8", NULL,
-                       colorize_conversation_cb, CONV_ETHER+8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 9", NULL,
-                       colorize_conversation_cb, CONV_ETHER+9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/Color 10", NULL,
-                       colorize_conversation_cb, CONV_ETHER+10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/Ethernet/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/Ethernet/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, CONV_ETHER, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/IP", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 1", NULL,
-                       colorize_conversation_cb, CONV_IP+1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 2", NULL,
-                       colorize_conversation_cb, CONV_IP+2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 3", NULL,
-                       colorize_conversation_cb, CONV_IP+3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 4", NULL,
-                       colorize_conversation_cb, CONV_IP+4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 5", NULL,
-                       colorize_conversation_cb, CONV_IP+5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 6", NULL,
-                       colorize_conversation_cb, CONV_IP+6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 7", NULL,
-                       colorize_conversation_cb, CONV_IP+7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 8", NULL,
-                       colorize_conversation_cb, CONV_IP+8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 9", NULL,
-                       colorize_conversation_cb, CONV_IP+9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/Color 10", NULL,
-                       colorize_conversation_cb, CONV_IP+10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/IP/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/IP/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, CONV_IP, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/TCP", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 1", NULL,
-                       colorize_conversation_cb, CONV_TCP+1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 2", NULL,
-                       colorize_conversation_cb, CONV_TCP+2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 3", NULL,
-                       colorize_conversation_cb, CONV_TCP+3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 4", NULL,
-                       colorize_conversation_cb, CONV_TCP+4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 5", NULL,
-                       colorize_conversation_cb, CONV_TCP+5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 6", NULL,
-                       colorize_conversation_cb, CONV_TCP+6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 7", NULL,
-                       colorize_conversation_cb, CONV_TCP+7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 8", NULL,
-                       colorize_conversation_cb, CONV_TCP+8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 9", NULL,
-                       colorize_conversation_cb, CONV_TCP+9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/Color 10", NULL,
-                       colorize_conversation_cb, CONV_TCP+10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/TCP/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/TCP/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, CONV_TCP, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/UDP", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 1", NULL,
-                       colorize_conversation_cb, CONV_UDP+1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 2", NULL,
-                       colorize_conversation_cb, CONV_UDP+2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 3", NULL,
-                       colorize_conversation_cb, CONV_UDP+3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 4", NULL,
-                       colorize_conversation_cb, CONV_UDP+4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 5", NULL,
-                       colorize_conversation_cb, CONV_UDP+5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 6", NULL,
-                       colorize_conversation_cb, CONV_UDP+6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 7", NULL,
-                       colorize_conversation_cb, CONV_UDP+7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 8", NULL,
-                       colorize_conversation_cb, CONV_UDP+8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 9", NULL,
-                       colorize_conversation_cb, CONV_UDP+9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/Color 10", NULL,
-                       colorize_conversation_cb, CONV_UDP+10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/UDP/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/UDP/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, CONV_UDP, GTK_STOCK_SELECT_COLOR),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/PN-CBA Server", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 1", NULL,
-                       colorize_conversation_cb, CONV_CBA+1*256, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 2", NULL,
-                       colorize_conversation_cb, CONV_CBA+2*256, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 3", NULL,
-                       colorize_conversation_cb, CONV_CBA+3*256, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 4", NULL,
-                       colorize_conversation_cb, CONV_CBA+4*256, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 5", NULL,
-                       colorize_conversation_cb, CONV_CBA+5*256, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 6", NULL,
-                       colorize_conversation_cb, CONV_CBA+6*256, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 7", NULL,
-                       colorize_conversation_cb, CONV_CBA+7*256, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 8", NULL,
-                       colorize_conversation_cb, CONV_CBA+8*256, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 9", NULL,
-                       colorize_conversation_cb, CONV_CBA+9*256, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/Color 10", NULL,
-                       colorize_conversation_cb, CONV_CBA+10*256, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize Conversation/PN-CBA Server/<separator>", NULL,
-                       NULL, 0, "<Separator>",NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize Conversation/PN-CBA Server/New Coloring Rule...", NULL,
-                       colorize_conversation_cb, CONV_CBA, GTK_STOCK_SELECT_COLOR),
-
-    ITEM_FACTORY_ENTRY("/SCTP", NULL, NULL, 0, "<Branch>",NULL),
-    ITEM_FACTORY_ENTRY("/SCTP/Analyse this Association", NULL, sctp_analyse_start,
-                       0, NULL,NULL),
-    ITEM_FACTORY_ENTRY("/SCTP/Prepare Filter for this Association", NULL, sctp_set_assoc_filter,
-                       0, NULL,NULL),
-
-    ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_tcp_stream_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Follow UDP Stream", NULL, follow_udp_stream_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, follow_ssl_stream_cb,
-                       0, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_ENTRY("/Copy", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Summary (Text)", NULL, packet_list_copy_summary_cb, CS_TEXT, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Summary (CSV)", NULL, packet_list_copy_summary_cb, CS_CSV, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/As Filter", NULL, match_selected_plist_cb,
-                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex Text)", NULL, copy_hex_cb, CD_ALLINFO, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex)", NULL, copy_hex_cb, CD_HEXCOLUMNS, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Printable Text Only)", NULL, copy_hex_cb, CD_TEXTONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Hex Stream)", NULL, copy_hex_cb, CD_HEX, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Binary Stream)", NULL, copy_hex_cb, CD_BINARY, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb,
-                       0, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, WIRESHARK_STOCK_DECODE_AS),
-    ITEM_FACTORY_STOCK_ENTRY("/Print...", NULL, file_print_selected_cmd_cb, 0, GTK_STOCK_PRINT),
-    ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb,
-                       0, NULL, NULL)
+    "/Mark Packet (toggle)", NULL, GTK_MENU_FUNC(packet_list_mark_frame_cb), 0, NULL, NULL,
+    "/Set Time Reference (toggle)", NULL, GTK_MENU_FUNC(reftime_frame_cb), REFTIME_TOGGLE, "<StockItem>", WIRESHARK_STOCK_TIME,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Apply as Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+
+    "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Prepare a Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_REPLACE, NULL, NULL,
+    "/Prepare a Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_NOT, NULL, NULL,
+    "/Prepare a Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_AND, NULL, NULL,
+    "/Prepare a Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_OR, NULL, NULL,
+    "/Prepare a Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_AND_NOT, NULL, NULL,
+    "/Prepare a Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_OR_NOT, NULL, NULL,
+
+    "/Conversation Filter", NULL, NULL, 0, "<Branch>",NULL,
+    "/Conversation Filter/Ethernet", NULL, GTK_MENU_FUNC(conversation_cb),
+                       CONV_ETHER, NULL, NULL,
+    "/Conversation Filter/IP", NULL, GTK_MENU_FUNC(conversation_cb),
+                       CONV_IP, NULL, NULL,
+    "/Conversation Filter/TCP", NULL, GTK_MENU_FUNC(conversation_cb),
+                       CONV_TCP, NULL, NULL,
+    "/Conversation Filter/UDP", NULL, GTK_MENU_FUNC(conversation_cb),
+                       CONV_UDP, NULL, NULL,
+    "/Conversation Filter/PN-CBA Server", NULL, GTK_MENU_FUNC(conversation_cb),
+                       CONV_CBA, NULL, NULL,
+
+    "/Colorize Conversation", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/Ethernet", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/Ethernet/Color 1", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize Conversation/Ethernet/Color 2", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize Conversation/Ethernet/Color 3", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize Conversation/Ethernet/Color 4", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize Conversation/Ethernet/Color 5", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize Conversation/Ethernet/Color 6", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize Conversation/Ethernet/Color 7", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize Conversation/Ethernet/Color 8", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize Conversation/Ethernet/Color 9", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize Conversation/Ethernet/Color 10", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER+10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize Conversation/Ethernet/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/Colorize Conversation/Ethernet/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_ETHER, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/Colorize Conversation/IP", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/IP/Color 1", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize Conversation/IP/Color 2", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize Conversation/IP/Color 3", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize Conversation/IP/Color 4", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize Conversation/IP/Color 5", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize Conversation/IP/Color 6", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize Conversation/IP/Color 7", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize Conversation/IP/Color 8", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize Conversation/IP/Color 9", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize Conversation/IP/Color 10", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP+10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize Conversation/IP/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/Colorize Conversation/IP/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_IP, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/Colorize Conversation/TCP", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/TCP/Color 1", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize Conversation/TCP/Color 2", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize Conversation/TCP/Color 3", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize Conversation/TCP/Color 4", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize Conversation/TCP/Color 5", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize Conversation/TCP/Color 6", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize Conversation/TCP/Color 7", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize Conversation/TCP/Color 8", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize Conversation/TCP/Color 9", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize Conversation/TCP/Color 10", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP+10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize Conversation/TCP/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/Colorize Conversation/TCP/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_TCP, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/Colorize Conversation/UDP", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/UDP/Color 1", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize Conversation/UDP/Color 2", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize Conversation/UDP/Color 3", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize Conversation/UDP/Color 4", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize Conversation/UDP/Color 5", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize Conversation/UDP/Color 6", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize Conversation/UDP/Color 7", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize Conversation/UDP/Color 8", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize Conversation/UDP/Color 9", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize Conversation/UDP/Color 10", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP+10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize Conversation/UDP/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/Colorize Conversation/UDP/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_UDP, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+    "/Colorize Conversation/PN-CBA Server", NULL, NULL, 0, "<Branch>",NULL,
+    "/Colorize Conversation/PN-CBA Server/Color 1", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+1*256, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize Conversation/PN-CBA Server/Color 2", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+2*256, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize Conversation/PN-CBA Server/Color 3", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+3*256, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize Conversation/PN-CBA Server/Color 4", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+4*256, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize Conversation/PN-CBA Server/Color 5", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+5*256, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize Conversation/PN-CBA Server/Color 6", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+6*256, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize Conversation/PN-CBA Server/Color 7", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+7*256, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize Conversation/PN-CBA Server/Color 8", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+8*256, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize Conversation/PN-CBA Server/Color 9", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+9*256, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize Conversation/PN-CBA Server/Color 10", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA+10*256, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize Conversation/PN-CBA Server/<separator>", NULL,
+                       NULL, 0, "<Separator>",NULL,
+    "/Colorize Conversation/PN-CBA Server/New Coloring Rule...", NULL,
+                       GTK_MENU_FUNC(colorize_conversation_cb), CONV_CBA, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+
+    "/SCTP", NULL, NULL, 0, "<Branch>",NULL,
+    "/SCTP/Analyse this Association", NULL, GTK_MENU_FUNC(sctp_analyse_start),
+                       0, NULL,NULL,
+    "/SCTP/Prepare Filter for this Association", NULL, (sctp_set_assoc_filter),
+                       0, NULL,NULL,
+
+    "/Follow TCP Stream", NULL, (follow_tcp_stream_cb),
+                       0, NULL, NULL,
+    "/Follow UDP Stream", NULL, (follow_udp_stream_cb),
+                       0, NULL, NULL,
+    "/Follow SSL Stream", NULL, (follow_ssl_stream_cb),
+                       0, NULL, NULL,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Copy", NULL, NULL, 0, "<Branch>", NULL,
+    "/Copy/Summary (Text)", NULL, GTK_MENU_FUNC(packet_list_copy_summary_cb), CS_TEXT, NULL, NULL,
+    "/Copy/Summary (CSV)", NULL, GTK_MENU_FUNC(packet_list_copy_summary_cb), CS_CSV, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/As Filter", NULL, GTK_MENU_FUNC(match_selected_plist_cb),
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/Bytes (Offset Hex Text)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_ALLINFO, NULL, NULL,
+    "/Copy/Bytes (Offset Hex)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_HEXCOLUMNS, NULL, NULL,
+    "/Copy/Bytes (Printable Text Only)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_TEXTONLY, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/Bytes (Hex Stream)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_HEX, NULL, NULL,
+    "/Copy/Bytes (Binary Stream)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_BINARY, NULL, NULL,
+
+    "/Export Selected Packet Bytes...", NULL, GTK_MENU_FUNC(savehex_cb),
+                       0, NULL, NULL,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Decode As...", NULL, GTK_MENU_FUNC(decode_as_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,
+    "/Print...", NULL, GTK_MENU_FUNC(file_print_selected_cmd_cb), 0, "<StockItem>", GTK_STOCK_PRINT,
+    "/Show Packet in New Window", NULL, GTK_MENU_FUNC(new_window_cb),
+                       0, NULL, NULL
 };
 
 static GtkItemFactoryEntry tree_view_menu_items[] =
 {
 
-    ITEM_FACTORY_ENTRY("/Expand Subtrees", NULL, expand_tree_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", 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, 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("/Colorize with Filter", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 1", NULL, colorize_selected_ptree_cb, 1, WIRESHARK_STOCK_COLOR1),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 2", NULL, colorize_selected_ptree_cb, 2, WIRESHARK_STOCK_COLOR2),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 3", NULL, colorize_selected_ptree_cb, 3, WIRESHARK_STOCK_COLOR3),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 4", NULL, colorize_selected_ptree_cb, 4, WIRESHARK_STOCK_COLOR4),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 5", NULL, colorize_selected_ptree_cb, 5, WIRESHARK_STOCK_COLOR5),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 6", NULL, colorize_selected_ptree_cb, 6, WIRESHARK_STOCK_COLOR6),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 7", NULL, colorize_selected_ptree_cb, 7, WIRESHARK_STOCK_COLOR7),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 8", NULL, colorize_selected_ptree_cb, 8, WIRESHARK_STOCK_COLOR8),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 9", NULL, colorize_selected_ptree_cb, 9, WIRESHARK_STOCK_COLOR9),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/Color 10", NULL, colorize_selected_ptree_cb, 10, WIRESHARK_STOCK_COLOR0),
-    ITEM_FACTORY_ENTRY("/Colorize with Filter/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Colorize with Filter/New Coloring Rule...", NULL, colorize_selected_ptree_cb, 0, GTK_STOCK_SELECT_COLOR),
-
-    ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_tcp_stream_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Follow UDP Stream", NULL, follow_udp_stream_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, follow_ssl_stream_cb,
-                       0, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_ENTRY("/Copy", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Description", NULL, copy_selected_plist_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/As Filter", NULL, match_selected_ptree_cb, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex Text)", NULL, copy_hex_cb, CD_ALLINFO | CD_FLAGS_SELECTEDONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex)", NULL, copy_hex_cb, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Printable Text Only)", NULL, copy_hex_cb, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Hex Stream)", NULL, copy_hex_cb, CD_HEX | CD_FLAGS_SELECTEDONLY, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Copy/Bytes (Binary Stream)", NULL, copy_hex_cb, CD_BINARY | CD_FLAGS_SELECTEDONLY, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb,
-                       0, NULL, NULL),
-
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-
-    ITEM_FACTORY_STOCK_ENTRY("/Wiki Protocol Page", NULL, selected_ptree_info_cb,
-                       0, WIRESHARK_STOCK_WIKI),
-    ITEM_FACTORY_STOCK_ENTRY("/Filter Field Reference", NULL, selected_ptree_ref_cb,
-                       0, WIRESHARK_STOCK_INTERNET),
-    ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
-                       0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, WIRESHARK_STOCK_DECODE_AS),
-    ITEM_FACTORY_STOCK_ENTRY("/Disable Protocol...", NULL, proto_disable_cb, 0, WIRESHARK_STOCK_CHECKBOX),
-    ITEM_FACTORY_ENTRY("/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
+    "/Expand Subtrees", NULL, GTK_MENU_FUNC(expand_tree_cb), 0, NULL, NULL,
+    "/Expand All", NULL, GTK_MENU_FUNC(expand_all_cb), 0, NULL, NULL,
+    "/Collapse All", NULL, GTK_MENU_FUNC(collapse_all_cb), 0, NULL, NULL,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Apply as Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+    "/Apply as Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL,
+
+    "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Prepare a Filter/_Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_REPLACE, NULL, NULL,
+    "/Prepare a Filter/_Not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_NOT, NULL, NULL,
+    "/Prepare a Filter/... _and Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND, NULL, NULL,
+    "/Prepare a Filter/... _or Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR, NULL, NULL,
+    "/Prepare a Filter/... a_nd not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_AND_NOT, NULL, NULL,
+    "/Prepare a Filter/... o_r not Selected", NULL, GTK_MENU_FUNC(match_selected_ptree_cb),
+                       MATCH_SELECTED_OR_NOT, NULL, NULL,
+
+    "/Colorize with Filter", NULL, NULL, 0, "<Branch>", NULL,
+    "/Colorize with Filter/Color 1", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 1, "<StockItem>", WIRESHARK_STOCK_COLOR1,
+    "/Colorize with Filter/Color 2", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 2, "<StockItem>", WIRESHARK_STOCK_COLOR2,
+    "/Colorize with Filter/Color 3", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 3, "<StockItem>", WIRESHARK_STOCK_COLOR3,
+    "/Colorize with Filter/Color 4", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 4, "<StockItem>", WIRESHARK_STOCK_COLOR4,
+    "/Colorize with Filter/Color 5", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 5, "<StockItem>", WIRESHARK_STOCK_COLOR5,
+    "/Colorize with Filter/Color 6", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 6, "<StockItem>", WIRESHARK_STOCK_COLOR6,
+    "/Colorize with Filter/Color 7", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 7, "<StockItem>", WIRESHARK_STOCK_COLOR7,
+    "/Colorize with Filter/Color 8", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 8, "<StockItem>", WIRESHARK_STOCK_COLOR8,
+    "/Colorize with Filter/Color 9", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 9, "<StockItem>", WIRESHARK_STOCK_COLOR9,
+    "/Colorize with Filter/Color 10", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 10, "<StockItem>", WIRESHARK_STOCK_COLOR0,
+    "/Colorize with Filter/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Colorize with Filter/New Coloring Rule...", NULL, GTK_MENU_FUNC(colorize_selected_ptree_cb), 0, "<StockItem>", GTK_STOCK_SELECT_COLOR,
+
+    "/Follow TCP Stream", NULL, GTK_MENU_FUNC(follow_tcp_stream_cb),
+                       0, NULL, NULL,
+    "/Follow UDP Stream", NULL, GTK_MENU_FUNC(follow_udp_stream_cb),
+                       0, NULL, NULL,
+    "/Follow SSL Stream", NULL, GTK_MENU_FUNC(follow_ssl_stream_cb),
+                       0, NULL, NULL,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Copy", NULL, NULL, 0, "<Branch>", NULL,
+    "/Copy/Description", NULL, GTK_MENU_FUNC(copy_selected_plist_cb), 0, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/As Filter", NULL, GTK_MENU_FUNC(match_selected_ptree_cb), MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/Bytes (Offset Hex Text)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_ALLINFO | CD_FLAGS_SELECTEDONLY, NULL, NULL,
+    "/Copy/Bytes (Offset Hex)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY, NULL, NULL,
+    "/Copy/Bytes (Printable Text Only)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_TEXTONLY | CD_FLAGS_SELECTEDONLY, NULL, NULL,
+    "/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Copy/Bytes (Hex Stream)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_HEX | CD_FLAGS_SELECTEDONLY, NULL, NULL,
+    "/Copy/Bytes (Binary Stream)", NULL, GTK_MENU_FUNC(copy_hex_cb), CD_BINARY | CD_FLAGS_SELECTEDONLY, NULL, NULL,
+
+    "/Export Selected Packet Bytes...", NULL, GTK_MENU_FUNC(savehex_cb),
+                       0, NULL, NULL,
+
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+
+    "/Wiki Protocol Page", NULL, GTK_MENU_FUNC(selected_ptree_info_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_WIKI,
+    "/Filter Field Reference", NULL, GTK_MENU_FUNC(selected_ptree_ref_cb),
+                       0, "<StockItem>", WIRESHARK_STOCK_INTERNET,
+    "/Protocol Preferences...", NULL, GTK_MENU_FUNC(properties_cb),
+                       0, NULL, NULL,
+    "/<separator>", NULL, NULL, 0, "<Separator>", NULL,
+    "/Decode As...", NULL, GTK_MENU_FUNC(decode_as_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,
+    "/Disable Protocol...", NULL, GTK_MENU_FUNC(proto_disable_cb), 0, "<StockItem>", WIRESHARK_STOCK_CHECKBOX,
+    "/_Resolve Name", NULL, GTK_MENU_FUNC(resolve_name_cb), 0, NULL, NULL,
+    "/_Go to Corresponding Packet", NULL, GTK_MENU_FUNC(goto_framenum_cb), 0, NULL, NULL,
 };
 
 

diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 07b766aeb8d6b11b89d26ef8d9488ec0676b9278..2c45318e4359f9491d14f866dba4319e231e62e3 100644 (file)
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -183,48 +183,48 @@ proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, g
 static GtkItemFactoryEntry proto_hier_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL,
+       "/Apply as Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Apply as Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL,
-               proto_hier_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL,
+       "/Prepare a Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Find Frame */
-       ITEM_FACTORY_ENTRY("/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame", NULL,
-               proto_hier_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL,
        /* Find Next */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next", NULL,
-               proto_hier_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame/Find Next", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL,
        /* Find Previous */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous", NULL,
-               proto_hier_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL),
+       "/Find Frame/Find Previous", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL,
        /* Colorize Protocol */
-       ITEM_FACTORY_ENTRY("/Colorize Protocol", NULL,
-               proto_hier_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL),
+       "/Colorize Protocol", NULL,
+               GTK_MENU_FUNC(proto_hier_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL,
 
 };
 

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 0419ef4a1abccf2aed4cba827810aa139d560760..4552c70cb5690a1a5fc26180955188d2b92c143d 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -271,62 +271,62 @@ srt_show_popup_menu_cb(void *widg _U_, GdkEvent *event, srt_stat_table *rst)
 static GtkItemFactoryEntry srt_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/.. and Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Apply as Filter/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL,
+       "/Apply as Filter/... not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/.. and Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Apply as Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Apply as Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL),
+       "/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,
+       "/Prepare a Filter/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL,
+       "/Prepare a Filter/Not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... and not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL,
+       "/Prepare a Filter/... or not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL,
 
        /* Find Frame */
-       ITEM_FACTORY_ENTRY("/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Frame/Not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED), NULL, NULL),
+       "/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Frame/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL,
+       "/Find Frame/Find Frame/Not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED), NULL, NULL,
        /* Find Next */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Next/Not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED), NULL, NULL),
+       "/Find Frame/Find Next", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Next/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL,
+       "/Find Frame/Find Next/Not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED), NULL, NULL,
 
        /* Find Previous */
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Find Frame/Find Previous/Not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED), NULL, NULL),
+       "/Find Frame/Find Previous", NULL, NULL, 0, "<Branch>", NULL,
+       "/Find Frame/Find Previous/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL,
+       "/Find Frame/Find Previous/Not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED), NULL, NULL,
 
        /* Colorize Procedure */
-       ITEM_FACTORY_ENTRY("/Colorize Procedure", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Procedure/Selected", NULL,
-               srt_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Colorize Procedure/Not Selected", NULL,
-               srt_select_filter_cb, CALLBACK_COLORIZE(ACTYPE_NOT_SELECTED), NULL, NULL),
+       "/Colorize Procedure", NULL, NULL, 0, "<Branch>", NULL,
+       "/Colorize Procedure/Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL,
+       "/Colorize Procedure/Not Selected", NULL,
+               GTK_MENU_FUNC(srt_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_NOT_SELECTED), NULL, NULL,
 
 };