diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c index 299f77c9c2..e1b1c9c572 100644 --- a/gtk/airpcap_gui_utils.c +++ b/gtk/airpcap_gui_utils.c @@ -384,22 +384,19 @@ airpcap_fill_key_list(GtkWidget *keylist) AirpcapValidationType airpcap_get_validation_type(const gchar* name) { - if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_ALL,name))) - { - return AIRPCAP_VT_ACCEPT_EVERYTHING; - } - else if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_CORRECT,name))) - { - return AIRPCAP_VT_ACCEPT_CORRECT_FRAMES; - } - else if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_CORRUPT,name))) - { - return AIRPCAP_VT_ACCEPT_CORRUPT_FRAMES; - } - else - { + if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_ALL,name))) + { + return AIRPCAP_VT_ACCEPT_EVERYTHING; + } + else if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_CORRECT,name))) + { + return AIRPCAP_VT_ACCEPT_CORRECT_FRAMES; + } + else if(!(g_ascii_strcasecmp(AIRPCAP_VALIDATION_TYPE_NAME_CORRUPT,name))) + { + return AIRPCAP_VT_ACCEPT_CORRUPT_FRAMES; + } return AIRPCAP_VT_UNKNOWN; - } } /* @@ -409,23 +406,23 @@ airpcap_get_validation_type(const gchar* name) gchar* airpcap_get_validation_name(AirpcapValidationType vt) { - if(vt == AIRPCAP_VT_ACCEPT_EVERYTHING) - { - return AIRPCAP_VALIDATION_TYPE_NAME_ALL; - } - else if(vt == AIRPCAP_VT_ACCEPT_CORRECT_FRAMES) - { - return AIRPCAP_VALIDATION_TYPE_NAME_CORRECT; - } - else if(vt == AIRPCAP_VT_ACCEPT_CORRUPT_FRAMES) - { - return AIRPCAP_VALIDATION_TYPE_NAME_CORRUPT; - } - else if(vt == AIRPCAP_VT_UNKNOWN) - { - return AIRPCAP_VALIDATION_TYPE_NAME_UNKNOWN; - } - return NULL; + if(vt == AIRPCAP_VT_ACCEPT_EVERYTHING) + { + return AIRPCAP_VALIDATION_TYPE_NAME_ALL; + } + else if(vt == AIRPCAP_VT_ACCEPT_CORRECT_FRAMES) + { + return AIRPCAP_VALIDATION_TYPE_NAME_CORRECT; + } + else if(vt == AIRPCAP_VT_ACCEPT_CORRUPT_FRAMES) + { + return AIRPCAP_VALIDATION_TYPE_NAME_CORRUPT; + } + else if(vt == AIRPCAP_VT_UNKNOWN) + { + return AIRPCAP_VALIDATION_TYPE_NAME_UNKNOWN; + } + return NULL; } /* @@ -614,6 +611,12 @@ airpcap_channel_offset_changed_cb(GtkWidget *channel_offset_cb, gpointer data _U { airpcap_if_selected->channelInfo.ExtChannel = airpcap_get_selected_channel_offset(channel_offset_cb); airpcap_if_selected->saved = FALSE; + change_airpcap_settings = TRUE; + if (!airpcap_update_frequency_and_offset(airpcap_if_selected)){ + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK, + "Unable to set extension channel %d", + airpcap_if_selected->channelInfo.ExtChannel); + } } diff --git a/gtk/main_airpcap_toolbar.c b/gtk/main_airpcap_toolbar.c index fe26a440e5..31dc8d9223 100644 --- a/gtk/main_airpcap_toolbar.c +++ b/gtk/main_airpcap_toolbar.c @@ -282,7 +282,7 @@ GtkWidget *airpcap_toolbar_new() /* callback for channel combo box */ g_signal_connect(channel_cb,"changed", G_CALLBACK(airpcap_channel_changed_set_cb), channel_offset_cb); /* callback for channel offset combo box */ - g_signal_connect(GTK_COMBO_BOX(channel_offset_cb), "changed", G_CALLBACK(airpcap_channel_offset_changed_cb), NULL); + g_signal_connect(channel_offset_cb, "changed", G_CALLBACK(airpcap_channel_offset_changed_cb), NULL); /* End: Channel offset combo box */ /* Wrong CRC Label */