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

Revert: 

airpcap_tb -> wireless_tb

Second try.

svn path=/trunk/; revision=43364
This commit is contained in:
Anders Broman 2012-06-19 14:37:46 +00:00
parent 85aad38347
commit 1992295e16
7 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ui/gtk/airpcap_gui_utils.c
View File

@ -79,22 +79,22 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info)
gchar *if_label_text;
airpcap_toolbar_label = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
toolbar_channel_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
airpcap_toolbar_button = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
airpcap_toolbar_label = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
toolbar_channel_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
airpcap_toolbar_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
/* The current interface is an airpcap interface */
if(if_info != NULL)
{
gtk_widget_set_sensitive(airpcap_tb,TRUE);
gtk_widget_set_sensitive(wireless_tb,TRUE);
gtk_widget_set_sensitive(airpcap_toolbar_label,TRUE);
gtk_widget_set_sensitive(toolbar_channel_cb,TRUE);
gtk_widget_set_sensitive(airpcap_toolbar_channel_lb,TRUE);
@ -109,12 +109,12 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info)
gtk_widget_set_sensitive(airpcap_toolbar_keys_button,FALSE);
/*decryption check box*/
g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb);
g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, wireless_tb);
if(if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),FALSE);
g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb);
g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, wireless_tb);
if_label_text = g_strdup_printf("Current Wireless Interface: #%s", airpcap_get_if_string_number(if_info));
gtk_label_set_text(GTK_LABEL(airpcap_toolbar_label),if_label_text);
@ -135,7 +135,7 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info)
}
else /* Current interface is NOT an AirPcap one... */
{
gtk_widget_set_sensitive(airpcap_tb,FALSE);
gtk_widget_set_sensitive(wireless_tb,FALSE);
gtk_widget_set_sensitive(airpcap_toolbar_label,FALSE);
gtk_widget_set_sensitive(toolbar_channel_cb,FALSE);
gtk_widget_set_sensitive(airpcap_toolbar_channel_lb,FALSE);
@ -172,23 +172,23 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info)
gchar *if_label_text;
airpcap_toolbar_crc_filter_combo = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_label = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
toolbar_channel_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
airpcap_toolbar_button = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
airpcap_toolbar_crc_filter_combo = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_label = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
toolbar_channel_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
airpcap_toolbar_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
/* The current interface is an airpcap interface */
if(if_info != NULL)
{
gtk_widget_set_sensitive(airpcap_tb,TRUE);
gtk_widget_set_sensitive(wireless_tb,TRUE);
gtk_widget_set_sensitive(airpcap_toolbar_label,TRUE);
gtk_widget_set_sensitive(toolbar_channel_cb,TRUE);
gtk_widget_set_sensitive(airpcap_toolbar_channel_lb,TRUE);
@ -204,12 +204,12 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info)
airpcap_validation_type_combo_set_by_type(airpcap_toolbar_crc_filter_combo, if_info->CrcValidationOn);
/*decription check box*/
g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb);
g_signal_handlers_block_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, wireless_tb);
if(if_info->DecryptionOn == AIRPCAP_DECRYPTION_ON)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(airpcap_toolbar_decryption),FALSE);
g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, airpcap_tb);
g_signal_handlers_unblock_by_func (airpcap_toolbar_decryption,airpcap_toolbar_encryption_cb, wireless_tb);
if_label_text = g_strdup_printf("Current Wireless Interface: #%s", airpcap_get_if_string_number(if_info));
gtk_label_set_text(GTK_LABEL(airpcap_toolbar_label),if_label_text);
@ -230,7 +230,7 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info)
}
else
{
gtk_widget_set_sensitive(airpcap_tb,TRUE);
gtk_widget_set_sensitive(wireless_tb,TRUE);
gtk_widget_set_sensitive(airpcap_toolbar_label,FALSE);
gtk_widget_set_sensitive(toolbar_channel_cb,FALSE);
gtk_widget_set_sensitive(airpcap_toolbar_channel_lb,FALSE);

8
ui/gtk/capture_dlg.c
View File

@ -662,10 +662,10 @@ options_airpcap_advanced_cb(GtkWidget *w, gpointer d)
from_widget = (gint*)g_malloc(sizeof(gint));
*from_widget = AIRPCAP_ADVANCED_FROM_OPTIONS;
g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
g_object_set_data(G_OBJECT(wireless_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
airpcap_if_active = airpcap_if_selected;
airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
airpcap_enable_toolbar_widgets(wireless_tb,FALSE);
display_airpcap_advanced_cb(w,d);
}
#endif
@ -2277,7 +2277,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
advanced_bt = gtk_button_new_with_label("Wireless Settings");
/* Both the callback and the data are global */
g_signal_connect(advanced_bt,"clicked", G_CALLBACK(options_airpcap_advanced_cb), airpcap_tb);
g_signal_connect(advanced_bt,"clicked", G_CALLBACK(options_airpcap_advanced_cb), wireless_tb);
g_object_set_data(G_OBJECT(top_level),AIRPCAP_OPTIONS_ADVANCED_KEY, advanced_bt);
airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list, device.name);
if (airpcap_if_selected != NULL) {
@ -3610,7 +3610,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
/* load the airpcap interfaces */
airpcap_if_list = get_airpcap_interface_list(&err, &err_str);
decryption_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
decryption_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
update_decryption_mode_list(decryption_cb);
if (airpcap_if_list == NULL && err == CANT_GET_AIRPCAP_INTERFACE_LIST) {

6
ui/gtk/capture_if_dlg.c
View File

@ -664,19 +664,19 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
#ifdef HAVE_AIRPCAP
/* LOAD AIRPCAP INTERFACES */
decryption_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
decryption_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
update_decryption_mode_list(decryption_cb);
/* If no airpcap interface is present, gray everything */
if (airpcap_if_active == NULL) {
if (airpcap_if_list == NULL) {
/*No airpcap device found */
airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
airpcap_enable_toolbar_widgets(wireless_tb,FALSE);
} else {
/* default adapter is not airpcap... or is airpcap but is not found*/
if (airpcap_if_active)
airpcap_set_toolbar_stop_capture(airpcap_if_active);
airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
airpcap_enable_toolbar_widgets(wireless_tb,FALSE);
}
}
if (airpcap_if_active)

16
ui/gtk/main.c
View File

@ -218,7 +218,7 @@ static GtkWidget *main_first_pane, *main_second_pane;
static GtkWidget *menubar, *main_tb, *filter_tb, *tv_scrollw, *statusbar, *welcome_pane;
#ifdef HAVE_AIRPCAP
GtkWidget *airpcap_tb;
GtkWidget *wireless_tb;
int airpcap_dll_ret_val = -1;
#endif
@ -3484,7 +3484,7 @@ void main_widgets_rearrange(void) {
g_object_ref(G_OBJECT(main_tb));
g_object_ref(G_OBJECT(filter_tb));
#ifdef HAVE_AIRPCAP
g_object_ref(G_OBJECT(airpcap_tb));
g_object_ref(G_OBJECT(wireless_tb));
#endif
g_object_ref(G_OBJECT(pkt_scrollw));
g_object_ref(G_OBJECT(tv_scrollw));
@ -3518,7 +3518,7 @@ void main_widgets_rearrange(void) {
#ifdef HAVE_AIRPCAP
/* airpcap toolbar */
gtk_box_pack_start(GTK_BOX(main_vbox), airpcap_tb, FALSE, TRUE, 1);
gtk_box_pack_start(GTK_BOX(main_vbox), wireless_tb, FALSE, TRUE, 1);
#endif
/* fill the main layout panes */
@ -3632,9 +3632,9 @@ main_widgets_show_or_hide(void)
}
if (recent.wireless_toolbar_show) {
gtk_widget_show(airpcap_tb);
gtk_widget_show(wireless_tb);
} else {
gtk_widget_hide(airpcap_tb);
gtk_widget_hide(wireless_tb);
}
if (recent.packet_list_show && have_capture_file) {
@ -3810,8 +3810,8 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
main_pane_h2 = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show(main_pane_h2);
#ifdef HAVE_AIRPCAP
airpcap_tb = airpcap_toolbar_new();
gtk_widget_show(airpcap_tb);
wireless_tb = airpcap_toolbar_new();
gtk_widget_show(wireless_tb);
#endif
/* status bar */
statusbar = statusbar_new();
@ -3843,7 +3843,7 @@ show_main_window(gboolean doing_work)
gdk_window_raise(gtk_widget_get_window(top_level));
#ifdef HAVE_AIRPCAP
airpcap_toolbar_show(airpcap_tb);
airpcap_toolbar_show(wireless_tb);
#endif /* HAVE_AIRPCAP */
}

2
ui/gtk/main.h
View File

@ -59,7 +59,7 @@ extern GString *comp_info_str;
/** Global runtime version string */
extern GString *runtime_info_str;
extern GtkWidget* airpcap_tb;
extern GtkWidget* wireless_tb;
extern void protect_thread_critical_region(void);
extern void unprotect_thread_critical_region(void);

60
ui/gtk/main_airpcap_toolbar.c
View File

@ -160,7 +160,7 @@ toolbar_display_airpcap_advanced_cb(GtkWidget *w, gpointer data)
from_widget = (gint*)g_malloc(sizeof(gint));
*from_widget = AIRPCAP_ADVANCED_FROM_TOOLBAR;
g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
g_object_set_data(G_OBJECT(wireless_tb),AIRPCAP_ADVANCED_FROM_KEY,from_widget);
display_airpcap_advanced_cb(w,data);
}
@ -175,7 +175,7 @@ toolbar_display_airpcap_key_management_cb(GtkWidget *w, gpointer data)
from_widget = (gint*)g_malloc(sizeof(gint));
*from_widget = AIRPCAP_ADVANCED_FROM_TOOLBAR;
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_ADVANCED_FROM_KEY, from_widget);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_ADVANCED_FROM_KEY, from_widget);
display_airpcap_key_management_cb(w,data);
}
@ -188,7 +188,7 @@ GtkWidget *airpcap_toolbar_new(void)
*channel_offset_cb = NULL,
*fcs_filter_lb = NULL,
*fcs_filter_cb = NULL;
GtkWidget *airpcap_tb;
GtkWidget *wireless_tb;
GtkWidget *decryption_mode_lb;
GtkWidget *decryption_mode_cb;
@ -198,25 +198,25 @@ GtkWidget *airpcap_toolbar_new(void)
*tool_item;
/* airpcap toolbar */
airpcap_tb = gtk_toolbar_new();
gtk_orientable_set_orientation(GTK_ORIENTABLE(airpcap_tb),
wireless_tb = gtk_toolbar_new();
gtk_orientable_set_orientation(GTK_ORIENTABLE(wireless_tb),
GTK_ORIENTATION_HORIZONTAL);
/* Create the "802.11 Channel:" label */
channel_lb = gtk_label_new("802.11 Channel: ");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY, channel_lb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY, channel_lb);
gtk_widget_show(channel_lb);
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), channel_lb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "Current 802.11 Channel");
/* Create the channel combo box */
channel_cb = gtk_combo_box_text_new();
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_CHANNEL_KEY, channel_cb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_KEY, channel_cb);
/* Select the current channel */
airpcap_update_channel_combo(GTK_WIDGET(channel_cb), airpcap_if_selected);
@ -226,25 +226,25 @@ GtkWidget *airpcap_toolbar_new(void)
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), channel_cb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "802.11 Channel");
/* Create the "Channel Offset:" label */
channel_offset_lb = gtk_label_new("Channel Offset: ");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY, channel_offset_lb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY, channel_offset_lb);
gtk_widget_show(channel_offset_lb);
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), channel_offset_lb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "Current 802.11 Channel Offset");
/* Start: Channel offset combo box */
channel_offset_cb = gtk_combo_box_text_new();
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY, channel_offset_cb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY, channel_offset_cb);
if(airpcap_if_active != NULL){
airpcap_update_channel_offset_combo(airpcap_if_active, airpcap_if_active->channelInfo.Frequency, channel_offset_cb, FALSE);
@ -259,7 +259,7 @@ GtkWidget *airpcap_toolbar_new(void)
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), channel_offset_cb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
/* callback for channel combo box */
g_signal_connect(channel_cb,"changed", G_CALLBACK(airpcap_channel_changed_set_cb), channel_offset_cb);
@ -269,16 +269,16 @@ GtkWidget *airpcap_toolbar_new(void)
/* Wrong CRC Label */
fcs_filter_lb = gtk_label_new(" FCS Filter: ");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY, fcs_filter_lb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY, fcs_filter_lb);
gtk_widget_show(fcs_filter_lb);
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), fcs_filter_lb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
/* FCS filter combo box */
fcs_filter_cb = gtk_combo_box_text_new();
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_FCS_FILTER_KEY, fcs_filter_cb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_KEY, fcs_filter_cb);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fcs_filter_cb), airpcap_get_validation_name(AIRPCAP_VT_ACCEPT_EVERYTHING));
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fcs_filter_cb), airpcap_get_validation_name(AIRPCAP_VT_ACCEPT_CORRECT_FRAMES));
@ -297,11 +297,11 @@ GtkWidget *airpcap_toolbar_new(void)
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), fcs_filter_cb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
/* Decryption mode combo box */
decryption_mode_lb = gtk_label_new ("Decryption Mode: ");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY, decryption_mode_lb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY, decryption_mode_lb);
gtk_widget_set_name (decryption_mode_lb, "decryption_mode_lb");
gtk_widget_show (decryption_mode_lb);
@ -313,45 +313,45 @@ GtkWidget *airpcap_toolbar_new(void)
tool_item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (tool_item), decryption_mode_cb);
gtk_widget_show (GTK_WIDGET (tool_item));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), tool_item, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
gtk_widget_set_tooltip_text(fcs_filter_lb, "Choose a Decryption Mode");
/* Set current decryption mode!!!! */
update_decryption_mode(decryption_mode_cb);
g_signal_connect(decryption_mode_cb, "changed", G_CALLBACK(on_decryption_mode_cb_changed), NULL);
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_DECRYPTION_KEY, decryption_mode_cb);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_KEY, decryption_mode_cb);
/* Advanced button */
advanced_bt = gtk_tool_button_new(NULL, /* a widget that will be used as icon widget, or NULL */
"Wireless Settings...");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_ADVANCED_KEY, advanced_bt);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_ADVANCED_KEY, advanced_bt);
g_signal_connect(advanced_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_advanced_cb), airpcap_tb);
g_signal_connect(advanced_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_advanced_cb), wireless_tb);
gtk_widget_show(GTK_WIDGET(advanced_bt));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), advanced_bt, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), advanced_bt, -1);
gtk_widget_set_tooltip_text(GTK_WIDGET(advanced_bt), "Set Advanced Wireless Settings");
/* Key Management button */
key_management_bt = gtk_tool_button_new(NULL, /* a widget that will be used as icon widget, or NULL */
"Decryption Keys...");
g_object_set_data(G_OBJECT(airpcap_tb), AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY, key_management_bt);
g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY, key_management_bt);
g_signal_connect(key_management_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_key_management_cb), airpcap_tb);
g_signal_connect(key_management_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_key_management_cb), wireless_tb);
gtk_widget_show(GTK_WIDGET(key_management_bt));
gtk_toolbar_insert(GTK_TOOLBAR(airpcap_tb), key_management_bt, -1);
gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), key_management_bt, -1);
gtk_widget_set_tooltip_text(GTK_WIDGET(key_management_bt), "Manage Decryption Keys");
/* If no airpcap interface is present, gray everything */
if(airpcap_if_active == NULL) {
if(airpcap_if_list == NULL || g_list_length(airpcap_if_list) == 0) {
/* No airpcap device found */
airpcap_enable_toolbar_widgets(airpcap_tb, FALSE);
airpcap_enable_toolbar_widgets(wireless_tb, FALSE);
/* recent.airpcap_toolbar_show = TRUE; */
} else {
/* default adapter is not airpcap... or is airpcap but is not found*/
airpcap_set_toolbar_stop_capture(airpcap_if_active);
airpcap_enable_toolbar_widgets(airpcap_tb, FALSE);
airpcap_enable_toolbar_widgets(wireless_tb, FALSE);
/* recent.airpcap_toolbar_show = TRUE; */
}
} else {
@ -359,7 +359,7 @@ GtkWidget *airpcap_toolbar_new(void)
/* recent.airpcap_toolbar_show = TRUE; */
}
return airpcap_tb;
return wireless_tb;
}
static void
@ -371,7 +371,7 @@ driver_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
recent.airpcap_driver_check_show = !r;
}
void airpcap_toolbar_show(GtkWidget *airpcap_tb _U_)
void airpcap_toolbar_show(GtkWidget *wireless_tb _U_)
{
/*
* This will read the decryption keys from the preferences file, and will

2
ui/gtk/prefs_dlg.c
View File

@ -1164,7 +1164,7 @@ prefs_airpcap_update(void)
gboolean airpcap_decryption_was_enabled = FALSE;
gboolean wireshark_decryption_is_now_enabled = FALSE;
decryption_cm = GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
decryption_cm = GTK_WIDGET(g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
if (decryption_cm == NULL) {
return;