osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Gerald Combs 2008-10-15 21:43:00 +00:00
parent 9a24983e9d
commit 9a41723b2b
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airpcap_loader.c
View File

@ -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;
}

10
gtk/airpcap_dlg.c
View File

@ -402,12 +402,16 @@ on_channel_en_changed(GtkWidget *w _U_, gpointer data)
* Changed callback for the channel offset combobox
*/
static void
on_channel_offset_cb_changed(GtkWidget *w _U_, gpointer data)
on_channel_offset_cb_changed(GtkWidget *w, gpointer data)
{
const gchar *s;
gchar offset;
int offset;
if ( !block_advanced_signals && (data != NULL) && (w != NULL) )
if (w == NULL || GTK_WIDGET_SENSITIVE(w)) {
return;
}
if ( !block_advanced_signals && (data != NULL) )
{
s = gtk_entry_get_text(GTK_ENTRY(w));
if ((g_ascii_strcasecmp("",s)))

12
gtk/main_airpcap_toolbar.c
View File

@ -23,7 +23,7 @@
*/
/*
* This file implements the "filter" toolbar for Wireshark.
* This file implements the wireless toolbar for Wireshark.
*/
#ifdef HAVE_CONFIG_H
@ -84,12 +84,16 @@ airpcap_toolbar_channel_changed_cb(GtkWidget *w _U_, gpointer data)
* Changed callback for the channel offset combobox
*/
static void
on_channel_offset_cb_changed(GtkWidget *w _U_, gpointer data)
on_channel_offset_cb_changed(GtkWidget *w, gpointer data)
{
const gchar *s;
gchar offset;
int offset;
if ((data != NULL) && (w != NULL) && change_airpcap_settings)
if (w == NULL || GTK_WIDGET_SENSITIVE(w)) {
return;
}
if (data != NULL && change_airpcap_settings)
{
s = gtk_entry_get_text(GTK_ENTRY(w));
if ((g_ascii_strcasecmp("",s)))