diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-06-24 19:43:09 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-06-24 19:43:09 +0000 |
| commit | 5cab183cfb0603b21aede540857aef087d094367 (patch) | |
| tree | a8262e9531bdc0760898b86926da99c6b4c2bf61 | |
| parent | 3b34b557f837ec7664983777123f7e328ba6f80f (diff) | |
Pontus Fuchs (via bug 6973):
Make the wireless toolbar actually appear.
svn path=/trunk/; revision=43465
| -rw-r--r-- | ui/gtk/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 2bd29e66fb..39f2fa623d 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -139,6 +139,7 @@ extern gint if_list_comparator_alph (const void *first_arg, const void *second_a #include "ui/gtk/filter_dlg.h" #include "ui/gtk/uat_gui.h" #include "ui/gtk/main.h" +#include "ui/gtk/main_80211_toolbar.h" #include "ui/gtk/main_airpcap_toolbar.h" #include "ui/gtk/main_filter_toolbar.h" #include "ui/gtk/main_titlebar.h" @@ -3483,9 +3484,7 @@ void main_widgets_rearrange(void) { g_object_ref(G_OBJECT(menubar)); g_object_ref(G_OBJECT(main_tb)); g_object_ref(G_OBJECT(filter_tb)); -#ifdef HAVE_AIRPCAP g_object_ref(G_OBJECT(wireless_tb)); -#endif g_object_ref(G_OBJECT(pkt_scrollw)); g_object_ref(G_OBJECT(tv_scrollw)); g_object_ref(G_OBJECT(byte_nb_ptr_gbl)); @@ -3516,10 +3515,8 @@ void main_widgets_rearrange(void) { gtk_box_pack_start(GTK_BOX(main_vbox), filter_tb, FALSE, TRUE, 1); } -#ifdef HAVE_AIRPCAP /* airpcap toolbar */ gtk_box_pack_start(GTK_BOX(main_vbox), wireless_tb, FALSE, TRUE, 1); -#endif /* fill the main layout panes */ switch(prefs.gui_layout_type) { @@ -3811,8 +3808,11 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p) gtk_widget_show(main_pane_h2); #ifdef HAVE_AIRPCAP wireless_tb = airpcap_toolbar_new(); +#else gtk_widget_show(wireless_tb); #endif + wireless_tb = ws80211_toolbar_new(); + /* status bar */ statusbar = statusbar_new(); gtk_widget_show(statusbar); |