diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-10 10:13:34 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-10 10:13:34 +0000 |
| commit | 372cdf09e418d8b8b41bdc57f262579357b3c90f (patch) | |
| tree | 7e209a5e503796b2d923f74831ffde7307c270a4 | |
| parent | c8a1fac3f414fc1d2d7fefbf29eeceb45062c00d (diff) | |
From Jim Young via bug 4862:
GLIB 2.14 necessary to compile Wireshark with Protocol help.
svn path=/trunk/; revision=33204
| -rw-r--r-- | gtk/menus.c | 4 | ||||
| -rw-r--r-- | gtk/proto_help.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 1f4c18e495..4a83d3fbc9 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -1141,9 +1141,9 @@ static GtkItemFactoryEntry tree_view_menu_items[] = 0, "<StockItem>", WIRESHARK_STOCK_WIKI,}, {"/Filter Field Reference", NULL, GTK_MENU_FUNC(selected_ptree_ref_cb), 0, "<StockItem>", WIRESHARK_STOCK_INTERNET,}, -#if GLIB_CHECK_VERSION(2,6,0) +#if GLIB_CHECK_VERSION(2,14,0) /* GRegex */ {"/Protocol Help", NULL, NULL, 0, "<Branch>", NULL,}, -#endif +#endif /* GLIB_CHECK_VERSION(2,14,0) */ {"/Protocol Preferences", NULL, NULL, 0, NULL, NULL,}, {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, {"/Decode As...", NULL, GTK_MENU_FUNC(decode_as_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,}, diff --git a/gtk/proto_help.c b/gtk/proto_help.c index 664007987f..2fad3d44b8 100644 --- a/gtk/proto_help.c +++ b/gtk/proto_help.c @@ -41,7 +41,7 @@ #include <epan/strutil.h> #include <epan/proto.h> -#if GLIB_CHECK_VERSION(2,6,0) +#if GLIB_CHECK_VERSION(2,14,0) /* GRegex */ #define PH_MENU_TOP "/Protocol Help" @@ -663,10 +663,10 @@ static void ph_logging_handler(const gchar *domain _U_, GLogLevelFlags level, co } #endif /* PH_DEBUG_LOG */ -#else /* GLIB_CHECK_VERSION(2,6,0) */ +#else /* GLIB_CHECK_VERSION(2,14,0) */ /* No GRegex */ void proto_help_init(void) {} void proto_help_menu_init(GtkWidget *widget _U_) {} void proto_help_menu_modify(GtkTreeSelection *selection _U_, capture_file *cf _U_) {} -#endif /* GLIB_CHECK_VERSION(2,6,0) */ +#endif /* GLIB_CHECK_VERSION(2,14,0) */ |