capture_dlg.h:

- Replace airpcap_tb in comment
- Remove trailing whitespace
main.c:
- wireless_tb must always be defined now, even if compiling without
  HAVE_AIRPCAP

svn path=/trunk/; revision=43373

diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h
index 1a268b380739b5e856f8e63e4f60d1447d0e75d9..953b69173e7f26498ab8289ff0411eaebd29bb08 100644 (file)
--- a/ui/gtk/capture_dlg.h
+++ b/ui/gtk/capture_dlg.h
@@ -25,7 +25,7 @@
 #ifndef __CAPTURE_DLG_H__
 #define __CAPTURE_DLG_H__
 
-/* extern GtkWidget* airpcap_tb; */
+/* extern GtkWidget* wireless_tb; */
 
 /** @file
  *  "Capture Options" dialog box.
@@ -37,7 +37,7 @@
 enum
 {
     CAPTURE = 0,
-    IFACE_HIDDEN_NAME, 
+    IFACE_HIDDEN_NAME,
     INTERFACE,
     LINK,
     PMODE,
@@ -118,7 +118,7 @@ capture_remote_combo_recent_write_all(FILE *rf);
  * @param s string with hostname,port,auth_type
  * @return TRUE if correctly added
  */
-gboolean 
+gboolean
 capture_remote_combo_add_recent(gchar *s);
 #endif
 

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index a9da2a9fd060c41d7242548eb5132fa373e01da4..2bd29e66fb9ae27125120e9b12c5a0bbf0e9cb13 100644 (file)
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -217,8 +217,8 @@ static GtkWidget   *main_first_pane, *main_second_pane;
 /* internally used widgets */
 static GtkWidget   *menubar, *main_tb, *filter_tb, *tv_scrollw, *statusbar, *welcome_pane;
 
-#ifdef HAVE_AIRPCAP
 GtkWidget *wireless_tb;
+#ifdef HAVE_AIRPCAP
 int    airpcap_dll_ret_val = -1;
 #endif