diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-10-15 21:43:00 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-10-15 21:43:00 +0000 |
| commit | 9a41723b2b4bf2c2492f368447ac31a4122482cd (patch) | |
| tree | 39c6e514c46002e904808163e2c910ee5af08d70 /airpcap_loader.c | |
| parent | 9a24983e9dca9f040d618533bbcd4675f4bc5860 (diff) | |
| download | wireshark-9a41723b2b4bf2c2492f368447ac31a4122482cd.tar.gz | |
Keep the wireless toolbar extension channel entry from inadvertently
setting its value to -1. Fix a bug that kept the wireless toolbar from
being enabled if HAVE_PCAP_REMOTE was defined. Fix a couple of other
minor issues.
--Thisr line, and those below, will be ignored--
M airpcap_loader.c
M gtk/airpcap_dlg.c
M gtk/main_airpcap_toolbar.c
svn path=/trunk/; revision=26469
Diffstat (limited to 'airpcap_loader.c')
| -rw-r--r-- | airpcap_loader.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 3faebe97ef..b28a7f1be5 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -1453,7 +1453,11 @@ airpcap_if_info_t* get_airpcap_if_from_name(GList* if_list, const gchar* name) if_info = curr->data; if(if_info != NULL) { - if ( g_ascii_strcasecmp(if_info->name,name) == 0) + if ( g_ascii_strcasecmp(if_info->name,name) == 0 +#ifdef HAVE_PCAP_REMOTE /* The interface will be prepended with "rpcap://" */ + || g_str_has_suffix(name, if_info->name) +#endif + ) { return if_info; } |