osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

HAVE_LUA_5_1 is no longer required for the Tools menu 

svn path=/trunk/; revision=25121
This commit is contained in:
Ulf Lamping 2008-04-19 19:40:05 +00:00
parent a7e8d7f743
commit be2ddd2fd5
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/main_menu.c
View File

@ -1262,9 +1262,8 @@ register_stat_menu_item_stock(
case(REGISTER_STAT_GROUP_UNSORTED): toolspath = "/Statistics/"; break;
case(REGISTER_ANALYZE_GROUP_UNSORTED): toolspath = "/Analyze/"; break;
case(REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER): toolspath = "/Analyze/Conversation Filter/"; break;
#ifdef HAVE_LUA_5_1
case(REGISTER_STAT_GROUP_TELEPHONY): toolspath = "/Telephony/"; break;
case(REGISTER_TOOLS_GROUP_UNSORTED): toolspath = "/Tools/"; break;
#endif
default:
g_assert(!"no such menu group");
toolspath = NULL;
@ -1410,10 +1409,8 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
break;
case(REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER):
break;
#ifdef HAVE_LUA_5_1
case(REGISTER_TOOLS_GROUP_UNSORTED):
break;
#endif
default:
g_assert_not_reached();
}
@ -1495,11 +1492,9 @@ void merge_all_tap_menus(GList *node) {
sep_entry->path = "/Analyze/Conversation Filter/";
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
#ifdef HAVE_LUA_5_1
if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_UNSORTED)) {
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
#endif
}