aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-06-19 13:36:35 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-06-19 13:36:35 +0000
commit890a3f66ea0bb2c60bf1a674ef5eddf6664b2f05 (patch)
treeb7766f968361c17b9111e48c51688f2558e5eedc
parent2a58400811d9791682700872dae3d673267217f2 (diff)
airpcap_tb -> wireless_tb
svn path=/trunk/; revision=43359
-rw-r--r--ui/gtk/main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index e113968def..a9da2a9fd0 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -218,7 +218,7 @@ static GtkWidget *main_first_pane, *main_second_pane;
static GtkWidget *menubar, *main_tb, *filter_tb, *tv_scrollw, *statusbar, *welcome_pane;
#ifdef HAVE_AIRPCAP
-GtkWidget *airpcap_tb;
+GtkWidget *wireless_tb;
int airpcap_dll_ret_val = -1;
#endif
@@ -3484,7 +3484,7 @@ void main_widgets_rearrange(void) {
g_object_ref(G_OBJECT(main_tb));
g_object_ref(G_OBJECT(filter_tb));
#ifdef HAVE_AIRPCAP
- g_object_ref(G_OBJECT(airpcap_tb));
+ g_object_ref(G_OBJECT(wireless_tb));
#endif
g_object_ref(G_OBJECT(pkt_scrollw));
g_object_ref(G_OBJECT(tv_scrollw));
@@ -3518,7 +3518,7 @@ void main_widgets_rearrange(void) {
#ifdef HAVE_AIRPCAP
/* airpcap toolbar */
- gtk_box_pack_start(GTK_BOX(main_vbox), airpcap_tb, FALSE, TRUE, 1);
+ gtk_box_pack_start(GTK_BOX(main_vbox), wireless_tb, FALSE, TRUE, 1);
#endif
/* fill the main layout panes */
@@ -3632,9 +3632,9 @@ main_widgets_show_or_hide(void)
}
if (recent.wireless_toolbar_show) {
- gtk_widget_show(airpcap_tb);
+ gtk_widget_show(wireless_tb);
} else {
- gtk_widget_hide(airpcap_tb);
+ gtk_widget_hide(wireless_tb);
}
if (recent.packet_list_show && have_capture_file) {
@@ -3810,8 +3810,8 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
main_pane_h2 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show(main_pane_h2);
#ifdef HAVE_AIRPCAP
- airpcap_tb = airpcap_toolbar_new();
- gtk_widget_show(airpcap_tb);
+ wireless_tb = airpcap_toolbar_new();
+ gtk_widget_show(wireless_tb);
#endif
/* status bar */
statusbar = statusbar_new();
@@ -3843,7 +3843,7 @@ show_main_window(gboolean doing_work)
gdk_window_raise(gtk_widget_get_window(top_level));
#ifdef HAVE_AIRPCAP
- airpcap_toolbar_show(airpcap_tb);
+ airpcap_toolbar_show(wireless_tb);
#endif /* HAVE_AIRPCAP */
}