Put the rest of the #if GTK_MAJOR_VERSION >= 2 preprocessor statements around parts...

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

diff --git a/gtk/menu.c b/gtk/menu.c
index ee7e2e3a116edbe88336d51cc0a37e543d792d94..50104daf7b3c7f166f6709b48b7bd778f5736b01 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -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);*/
     }

diff --git a/stat_menu.h b/stat_menu.h
index dec78e8a5d26bf834bc32090cb5066b3091ab1e7..4149e8da27540e85ae60ab94d0255532d2f2f0aa 100644 (file)
--- a/stat_menu.h
+++ b/stat_menu.h
@@ -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,