osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove €˜GtkItemFactoryEntry code in MAIN_MENU_USE_UIMANAGER 

code path.
Don't build and don't use protocol help if MAIN_MENU_USE_UIMANAGER is defined.

svn path=/trunk/; revision=38024
This commit is contained in:
Anders Broman 2011-07-14 20:36:00 +00:00
parent 43806aff9d
commit 1785a37ab4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/menus.c
View File

@ -3821,9 +3821,9 @@ menus_init(void) {
#ifndef MAIN_MENU_USE_UIMANAGER
/* Init with an empty recent files list */
clear_menu_recent_capture_file_cmd_cb(NULL, NULL);
#endif /* MAIN_MENU_USE_UIMANAGER */
/* Protocol help links */
proto_help_menu_init(gtk_ui_manager_get_widget(ui_manager_tree_view_menu, "/TreeViewPopup"));
#endif /* MAIN_MENU_USE_UIMANAGER */
}
}
@ -4379,11 +4379,14 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
static void merge_all_tap_menus(GList *node) {
#ifdef MAIN_MENU_USE_UIMANAGER
#else
GtkItemFactoryEntry *sep_entry;
sep_entry = g_malloc0(sizeof (GtkItemFactoryEntry));
sep_entry->item_type = "<Separator>";
sep_entry->path = "/Statistics/";
#endif
#ifdef MAIN_MENU_USE_UIMANAGER
/* build the new menus */
#if 0
@ -4431,8 +4434,10 @@ static void merge_all_tap_menus(GList *node) {
if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_UNSORTED)) {
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
#ifdef MAIN_MENU_USE_UIMANAGER
#else
g_free (sep_entry);
#endif
}
/*

4
gtk/proto_help.c
View File

@ -24,7 +24,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* Exlude the whole menu if MAIN_MENU_USE_UIMANAGER */
#ifndef MAIN_MENU_USE_UIMANAGER
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@ -662,3 +663,4 @@ static void ph_logging_handler(const gchar *domain _U_, GLogLevelFlags level, co
}
}
#endif /* PH_DEBUG_LOG */
#endif /* MAIN_MENU_USE_UIMANAGER */