From Jim Young via bug 4862:
GLIB 2.14 necessary to compile Wireshark with Protocol help. svn path=/trunk/; revision=33204
This commit is contained in:
parent
c8a1fac3f4
commit
372cdf09e4
2 changed files with 5 additions and 5 deletions
|
@ -1141,9 +1141,9 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
|
||||||
0, "<StockItem>", WIRESHARK_STOCK_WIKI,},
|
0, "<StockItem>", WIRESHARK_STOCK_WIKI,},
|
||||||
{"/Filter Field Reference", NULL, GTK_MENU_FUNC(selected_ptree_ref_cb),
|
{"/Filter Field Reference", NULL, GTK_MENU_FUNC(selected_ptree_ref_cb),
|
||||||
0, "<StockItem>", WIRESHARK_STOCK_INTERNET,},
|
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,},
|
{"/Protocol Help", NULL, NULL, 0, "<Branch>", NULL,},
|
||||||
#endif
|
#endif /* GLIB_CHECK_VERSION(2,14,0) */
|
||||||
{"/Protocol Preferences", NULL, NULL, 0, NULL, NULL,},
|
{"/Protocol Preferences", NULL, NULL, 0, NULL, NULL,},
|
||||||
{"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
|
{"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
|
||||||
{"/Decode As...", NULL, GTK_MENU_FUNC(decode_as_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,},
|
{"/Decode As...", NULL, GTK_MENU_FUNC(decode_as_cb), 0, "<StockItem>", WIRESHARK_STOCK_DECODE_AS,},
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#include <epan/strutil.h>
|
#include <epan/strutil.h>
|
||||||
#include <epan/proto.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"
|
#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 */
|
#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_init(void) {}
|
||||||
void proto_help_menu_init(GtkWidget *widget _U_) {}
|
void proto_help_menu_init(GtkWidget *widget _U_) {}
|
||||||
void proto_help_menu_modify(GtkTreeSelection *selection _U_, capture_file *cf _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) */
|
||||||
|
|
Loading…
Reference in a new issue