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

Put the rest of the #if GTK_MAJOR_VERSION >= 2 preprocessor statements around parts of the Content List -> HTTP feature code. 

svn path=/trunk/; revision=20869
This commit is contained in:
Stephen Fisher 2007-02-20 00:22:00 +00:00
parent 0bc9ec9e44
commit 07f8ad771e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/menu.c
View File

@ -983,7 +983,9 @@ register_stat_menu_item(
switch(group) {
case(REGISTER_STAT_GROUP_GENERIC): toolspath = "/Statistics/"; break;
#if GTK_MAJOR_VERSION >= 2
case(REGISTER_STAT_GROUP_CONTENT_LIST): toolspath = "/Statistics/C_ontent List/"; break;
#endif
case(REGISTER_STAT_GROUP_CONVERSATION_LIST): toolspath = "/Statistics/_Conversation List/"; break;
case(REGISTER_STAT_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/_Endpoint List/"; break;
case(REGISTER_STAT_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service _Response Time/"; break;
@ -1104,7 +1106,7 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
break;
case(REGISTER_STAT_GROUP_GENERIC):
break;
case(REGISTER_STAT_GROUP_CONTENT_LIST):
case(REGISTER_STAT_GROUP_CONTENT_LIST):
#if GTK_MAJOR_VERSION > 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 6)
entry->item_type = "<StockItem>";
entry->extra_data = GTK_STOCK_FILE;
@ -1187,9 +1189,11 @@ void merge_all_tap_menus(GList *node) {
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_GENERIC)) {
gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
}
#if GTK_MAJOR_VERSION >= 2
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_CONTENT_LIST)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
}
#endif
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_CONVERSATION_LIST)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
}

2
stat_menu.h
View File

@ -45,7 +45,9 @@ extern "C" {
typedef enum {
REGISTER_STAT_GROUP_NONE,
REGISTER_STAT_GROUP_GENERIC,
#if GTK_MAJOR_VERSION >= 2
REGISTER_STAT_GROUP_CONTENT_LIST,
#endif
REGISTER_STAT_GROUP_CONVERSATION_LIST,
REGISTER_STAT_GROUP_ENDPOINT_LIST,
REGISTER_STAT_GROUP_RESPONSE_TIME,