diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-06-19 16:13:11 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-06-19 16:13:11 +0000 |
| commit | bca451b6630459eb1006881eb3675d461ba6617a (patch) | |
| tree | cdd3308c2f454183771ff9e5a0ae8f2fffbf4b75 | |
| parent | 1b1d6ff09673ecccd5ee31a0bc47a9d69f5488ec (diff) | |
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
| -rw-r--r-- | ui/gtk/capture_dlg.h | 6 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h index 1a268b3807..953b69173e 100644 --- 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 a9da2a9fd0..2bd29e66fb 100644 --- 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 |