diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-24 18:08:07 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-24 18:08:07 +0000 |
commit | 9ce88eaba7b0b4ace5b9a01bd0fe87ef6a4bc574 (patch) | |
tree | 2817a5898541ee7de0ce4947523c7cc76059e161 /gtk | |
parent | 6f334ecdb88cc7fa407a87f7074d7ae3b8dcf93b (diff) |
#if 0 "Work in progress" code
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34638 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/menus.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 787b6abb5c..1076c4dfc0 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -3931,7 +3931,9 @@ register_stat_menu_item( #ifdef MAIN_MENU_USE_UIMANAGER static guint merge_tap_menus_layered(GList *node, gint group) { GtkItemFactoryEntry *entry; - //gchar *p; +#if 0 + gchar *p; +#endif GtkAction *action; guint merge_id; GtkActionGroup *action_group; @@ -3988,10 +3990,12 @@ static guint merge_tap_menus_layered(GList *node, gint group) { entry->item_type = "<StockItem>"; entry->extra_data = node_data->stock_id; } - //gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, /* callback_type */ 2); - //set_menu_sensitivity_old(main_menu_factory, node_data->name, FALSE); /* no capture file yet */ - //added++; +#if 0 + gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, /* callback_type */ 2); + set_menu_sensitivity_old(main_menu_factory, node_data->name, FALSE); /* no capture file yet */ + added++; g_free(entry); +#endif } } else { /* @@ -4079,13 +4083,14 @@ static guint merge_tap_menus_layered(GList *node, gint group) { g_assert_not_reached(); } - - //gtk_item_factory_create_item(main_menu_factory, entry, - // NULL, 2); - // set_menu_sensitivity_old(main_menu_factory, node_data->name, - // FALSE); /* no children yet */ - // added++; - // g_free(entry); +#if 0 + gtk_item_factory_create_item(main_menu_factory, entry, + NULL, 2); + set_menu_sensitivity_old(main_menu_factory, node_data->name, + FALSE); /* no children yet */ + added++; + g_free(entry); +#endif } for (child = node_data->children; child != NULL; child = @@ -4239,15 +4244,15 @@ test code static void merge_all_tap_menus(GList *node) { GtkItemFactoryEntry *sep_entry; - //guint merge_id = 0; sep_entry = g_malloc0(sizeof (GtkItemFactoryEntry)); sep_entry->item_type = "<Separator>"; sep_entry->path = "/Statistics/"; #ifdef MAIN_MENU_USE_UIMANAGER /* build the new menus */ - //merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); - +#if 0 + merge_id = gtk_ui_manager_new_merge_id (ui_manager_main_menubar); +#endif #endif /* * merge only the menu items of the specific group, @@ -4304,8 +4309,10 @@ set_menu_sensitivity(GtkUIManager *ui_manager, const gchar *path, gint val) action = gtk_ui_manager_get_action(ui_manager, path); if(!action){ - //fprintf (stderr, "Warning: couldn't find action path= %s\n", - // path); +#if 0 + fprintf (stderr, "Warning: couldn't find action path= %s\n", + path); +#endif return; } #if GLIB_CHECK_VERSION(2,6,0) |