diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-06-19 13:14:25 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-06-19 13:14:25 +0000 |
| commit | d2b78d48f208da31d874b998a27ab4eef828eb8a (patch) | |
| tree | 1905602d2f7879b70c16ee495fb6a7fe6ca6c867 | |
| parent | f0f3e36bdac61c36a7fc66de7d86f9207bcdf309 (diff) | |
The option to activate the Wireless toolbar should always be available, even if the toolbar is useless.
(As it was before as we compiled with HAVE_AIRPCAP 1 ).
svn path=/trunk/; revision=43356
| -rw-r--r-- | ui/gtk/main_menubar.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 81f3ffbef9..b0b6e3471c 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -148,9 +148,7 @@ static void menus_init(void); static void merge_lua_menu_items(GList *node); static void ws_menubar_build_external_menus(void); static void set_menu_sensitivity (GtkUIManager *ui_manager, const gchar *, gint); -#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_WIRELESS_TOOLBAR) || !defined(HAVE_LIBPCAP) static void set_menu_visible(GtkUIManager *ui_manager, const gchar *path, gint val); -#endif static void name_resolution_cb(GtkWidget *w, gpointer d, gint action); static void colorize_cb(GtkWidget *w, gpointer d); @@ -3509,7 +3507,6 @@ menus_init(void) { #ifndef WANT_PACKET_EDITOR set_menu_visible(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket", FALSE); #endif /* WANT_PACKET_EDITOR */ - set_menu_visible(ui_manager_main_menubar, "/Menubar/ViewMenu/WirelessToolbar", FALSE); #ifndef HAVE_LIBPCAP set_menu_visible(ui_manager_main_menubar, "/Menubar/CaptureMenu", FALSE); @@ -3879,7 +3876,6 @@ set_menu_sensitivity(GtkUIManager *ui_manager, const gchar *path, gint val) gtk_action_set_sensitive (action, val); /* TRUE to make the action sensitive */ } -#if !defined(WANT_PACKET_EDITOR) || !defined(HAVE_WIRELESS_TOOLBAR) || !defined(HAVE_LIBPCAP) static void set_menu_visible(GtkUIManager *ui_manager, const gchar *path, gint val) { @@ -3893,7 +3889,6 @@ set_menu_visible(GtkUIManager *ui_manager, const gchar *path, gint val) } gtk_action_set_visible (action, val); /* TRUE to make the action visible */ } -#endif static void set_menu_object_data_meat(GtkUIManager *ui_manager, const gchar *path, const gchar *key, gpointer data) |