Get the Windows build going again(?).

svn path=/trunk/; revision=24869

2 files changed, 144 insertions, 144 deletions

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index b2aa009b92..c1675e2eb1 100644
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -148,7 +148,7 @@ on_key_ls_select_row(GtkWidget *widget,
 {
     airpcap_key_ls_selected_info_t*  selected_item;
 
-    selected_item = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    selected_item = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     selected_item->row = row;
     selected_item->column = column;
@@ -166,7 +166,7 @@ on_key_ls_unselect_row(GtkWidget *widget,
 {
     airpcap_key_ls_selected_info_t*  selected_item;
 
-    selected_item = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    selected_item = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     selected_item->row = NO_ROW_SELECTED;
     selected_item->column = NO_COLUMN_SELECTED;
@@ -221,9 +221,9 @@ on_edit_type_en_changed(GtkWidget *w, gpointer data)
     edit_key_w = GTK_WIDGET(data);
     type_te    = w;
 
-    edit_ssid_te = g_object_get_data(edit_key_w,AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY);
-    key_lb = g_object_get_data(edit_key_w,AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY);
-    ssid_lb = g_object_get_data(edit_key_w,AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY);
+    edit_ssid_te = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY);
+    key_lb = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY);
+    ssid_lb = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY);
 
     type_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(type_te)));
 
@@ -289,9 +289,9 @@ on_add_type_en_changed(GtkWidget *w, gpointer data)
     add_key_w = GTK_WIDGET(data);
     type_te    = w;
 
-    add_ssid_te = g_object_get_data(add_key_w,AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY);
-    key_lb = g_object_get_data(add_key_w,AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY);
-    ssid_lb = g_object_get_data(add_key_w,AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY);
+    add_ssid_te = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY);
+    key_lb = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY);
+    ssid_lb = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY);
 
     type_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(type_te)));
 
@@ -541,10 +541,10 @@ on_key_management_destroy(GtkWidget *w _U_, gpointer data _U_)
     /* Retrieve the GUI object pointers */
     airpcap_advanced_w  = GTK_WIDGET(data);
 
-    toolbar	= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_TOOLBAR_KEY));
+    toolbar	= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_TOOLBAR_KEY));
 
     /* ... */
-    from_widget	= (gint*)g_object_get_data(toolbar,AIRPCAP_ADVANCED_FROM_KEY);
+    from_widget	= (gint*)g_object_get_data(G_OBJECT(toolbar),AIRPCAP_ADVANCED_FROM_KEY);
     /* gray out the toolbar (if we came here from the toolbar advanced button)*/
     if ( *from_widget == AIRPCAP_ADVANCED_FROM_TOOLBAR)
         gtk_widget_set_sensitive(toolbar,TRUE);
@@ -577,10 +577,10 @@ on_airpcap_advanced_destroy(GtkWidget *w _U_, gpointer data _U_)
     /* Retrieve the GUI object pointers */
     airpcap_advanced_w  = GTK_WIDGET(data);
 
-    toolbar	= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_TOOLBAR_KEY));
+    toolbar	= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_TOOLBAR_KEY));
 
     /* ... */
-    from_widget	= (gint*)g_object_get_data(toolbar,AIRPCAP_ADVANCED_FROM_KEY);
+    from_widget	= (gint*)g_object_get_data(G_OBJECT(toolbar),AIRPCAP_ADVANCED_FROM_KEY);
     /* gray out the toolbar (if we came here from the toolbar advanced button)*/
     if ( *from_widget == AIRPCAP_ADVANCED_FROM_TOOLBAR)
         gtk_widget_set_sensitive(toolbar,TRUE);
@@ -622,10 +622,10 @@ on_key_management_apply_bt_clicked(GtkWidget *button _U_, gpointer data)
 
     /* retrieve main window */
     key_management_w      = GTK_WIDGET(data);
-    decryption_en         = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_WEP_DECRYPTION_KEY));
-    key_ls                = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY));
-    toolbar               = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_TOOLBAR_KEY));
-    toolbar_cm            = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_TOOLBAR_DECRYPTION_KEY));
+    decryption_en         = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_WEP_DECRYPTION_KEY));
+    key_ls                = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY));
+    toolbar               = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_TOOLBAR_KEY));
+    toolbar_cm            = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
 
 #define CANT_SAVE_ERR_STR "Cannot save configuration!\n" \
 	"In order to store the configuration in the registry you must:\n\n" \
@@ -676,13 +676,13 @@ on_advanced_apply_bt_clicked(GtkWidget *button, gpointer data _U_)
     /* retrieve main window */
     main_w = GTK_WIDGET(data);
 
-    toolbar = GTK_WIDGET(g_object_get_data(main_w,AIRPCAP_TOOLBAR_KEY));
+    toolbar = GTK_WIDGET(g_object_get_data(G_OBJECT(main_w),AIRPCAP_TOOLBAR_KEY));
 
     /* retrieve toolbar info */
-    toolbar_if_lb				= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_INTERFACE_KEY));
-    toolbar_channel_cm			= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_KEY));
-    toolbar_channel_offset_cb	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY));
-    toolbar_wrong_crc_cm		= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
+    toolbar_if_lb				= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_INTERFACE_KEY));
+    toolbar_channel_cm			= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_KEY));
+    toolbar_channel_offset_cb	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY));
+    toolbar_wrong_crc_cm		= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
 
     /* Save the configuration (for all ) */
     airpcap_save_selected_if_configuration(airpcap_if_selected);
@@ -718,15 +718,15 @@ airpcap_advanced_ok_cb(GtkWidget *w, gpointer data _U_)
     /* retrieve main window */
     main_w = GTK_WIDGET(data);
 
-    toolbar = GTK_WIDGET(g_object_get_data(main_w,AIRPCAP_TOOLBAR_KEY));
+    toolbar = GTK_WIDGET(g_object_get_data(G_OBJECT(main_w),AIRPCAP_TOOLBAR_KEY));
 
-    key_ls	= GTK_WIDGET(g_object_get_data(main_w,AIRPCAP_ADVANCED_KEYLIST_KEY));
+    key_ls	= GTK_WIDGET(g_object_get_data(G_OBJECT(main_w),AIRPCAP_ADVANCED_KEYLIST_KEY));
 
     /* retrieve toolbar info */
-    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_INTERFACE_KEY));
-    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_KEY));
-    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
-    toolbar_decryption_ck	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_DECRYPTION_KEY));
+    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_INTERFACE_KEY));
+    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_KEY));
+    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
+    toolbar_decryption_ck	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
 
     /* Save the configuration */
     airpcap_add_keys_from_list(key_ls,airpcap_if_selected);
@@ -788,11 +788,11 @@ on_add_key_ok_bt_clicked(GtkWidget *widget, gpointer data _U_)
     gint r = NO_ROW_SELECTED;
     gint c = NO_COLUMN_SELECTED;
 
-    key_ls = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY);
-    selected_item = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
-    type_cm = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY);
-    key_en = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY);
-    ssid_en = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY);
+    key_ls = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY);
+    selected_item = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    type_cm = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY);
+    key_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY);
+    ssid_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY);
 
     r = selected_item->row;
     c = selected_item->column;
@@ -996,11 +996,11 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget, gpointer data _U_)
     gint r = NO_ROW_SELECTED;
     gint c = NO_COLUMN_SELECTED;
 
-    key_ls = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY);
-    selected_item = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_EDIT_KEY_SELECTED_KEY);
-    type_cm = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY);
-    key_en = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY);
-    ssid_en = g_object_get_data(GTK_WIDGET(data),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY);
+    key_ls = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY);
+    selected_item = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_SELECTED_KEY);
+    type_cm = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY);
+    key_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY);
+    ssid_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY);
 
     r = selected_item->row;
     c = selected_item->column;
@@ -1214,13 +1214,13 @@ on_add_new_key_bt_clicked(GtkWidget *button, gpointer data _U_)
     airpcap_advanced_w = GTK_WIDGET(data);
 
     /* Retrieve the selected item... if no row is selected, this is null... */
-    selected_item = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    selected_item = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     r = selected_item->row;
     c = selected_item->column;
 
     /* Retrieve the key list widget pointer, and add it to the add_key_w */
-    key_ls = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+    key_ls = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
 
     keys_in_list = GTK_CLIST(key_ls)->rows;
 
@@ -1359,13 +1359,13 @@ on_add_new_key_bt_clicked(GtkWidget *button, gpointer data _U_)
     g_signal_connect(add_key_window, "destroy", G_CALLBACK(on_add_key_w_destroy), data);
 
     /* Add widget data */
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY,key_ls);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY,selected_item);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY,add_type_cm);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY,add_key_te);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY,add_ssid_te);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY,add_key_lb);
-    g_object_set_data(add_key_window,AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY,add_ssid_lb);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY,key_ls);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY,selected_item);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY,add_type_cm);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY,add_key_te);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY,add_ssid_te);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY,add_key_lb);
+    g_object_set_data(G_OBJECT(add_key_window),AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY,add_ssid_lb);
 
     gtk_widget_show(add_key_window);
 }
@@ -1428,8 +1428,8 @@ on_remove_key_bt_clicked(GtkWidget *button, gpointer data _U_)
     airpcap_advanced_w = GTK_WIDGET(data);
 
     /* retrieve needed stuff */
-    key_ls        = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
-    selected_item = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    key_ls        = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
+    selected_item = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     /*
      * Better to store the selected_item data in two new variables, because maybe some
@@ -1497,13 +1497,13 @@ on_edit_key_bt_clicked(GtkWidget *button, gpointer data _U_)
     airpcap_advanced_w = GTK_WIDGET(data);
 
     /* Retrieve the selected item... if no row is selected, this is null... */
-    selected_item = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    selected_item = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     r = selected_item->row;
     c = selected_item->column;
 
     /* Retrieve the key list widget pointer, and add it to the edit_key_w */
-    key_ls = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+    key_ls = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
 
     if ((r != NO_ROW_SELECTED) && (c != NO_COLUMN_SELECTED))
     {
@@ -1655,13 +1655,13 @@ on_edit_key_bt_clicked(GtkWidget *button, gpointer data _U_)
         g_signal_connect(edit_key_window, "destroy", G_CALLBACK(on_edit_key_w_destroy), data);
 
         /* Add widget data */
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY,key_ls);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_SELECTED_KEY,selected_item);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY,edit_type_cm);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY,edit_key_te);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY,edit_ssid_te);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY,edit_key_lb);
-        g_object_set_data(edit_key_window,AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY,edit_ssid_lb);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY,key_ls);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_SELECTED_KEY,selected_item);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY,edit_type_cm);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY,edit_key_te);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY,edit_ssid_te);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY,edit_key_lb);
+        g_object_set_data(G_OBJECT(edit_key_window),AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY,edit_ssid_lb);
 
         gtk_widget_show(edit_key_window);
     }
@@ -1686,8 +1686,8 @@ on_move_key_up_bt_clicked(GtkWidget *button, gpointer data _U_)
     airpcap_advanced_w = GTK_WIDGET(data);
 
     /* retrieve needed stuff */
-    key_ls        = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
-    selected_item = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    key_ls        = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
+    selected_item = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     /*
      * Better to store the selected_item data in two new variables, because maybe some
@@ -1736,8 +1736,8 @@ on_move_key_down_bt_clicked(GtkWidget *button, gpointer data _U_)
     airpcap_advanced_w = GTK_WIDGET(data);
 
     /* retrieve needed stuff */
-    key_ls        = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
-    selected_item = g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
+    key_ls        = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
+    selected_item = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY);
 
     /*
      * Better to store the selected_item data in two new variables, because maybe some
@@ -1946,9 +1946,9 @@ display_airpcap_advanced_cb(GtkWidget *w, gpointer data)
 
     /* user data - RETRIEVE pointers of toolbar widgets */
     toolbar				= GTK_WIDGET(data);
-    toolbar_if_lb		= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_INTERFACE_KEY));
-    toolbar_channel_cm	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_KEY));
-    toolbar_wrong_crc_cm= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
+    toolbar_if_lb		= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_INTERFACE_KEY));
+    toolbar_channel_cm	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_KEY));
+    toolbar_wrong_crc_cm= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
 
     /* gray out the toolbar */
     gtk_widget_set_sensitive(toolbar,FALSE);
@@ -2257,9 +2257,9 @@ display_airpcap_advanced_cb(GtkWidget *w, gpointer data)
     gtk_button_box_set_layout (GTK_BUTTON_BOX (right_h_button_box),
                                GTK_BUTTONBOX_END);
 
-    ok_bt = g_object_get_data(right_h_button_box, GTK_STOCK_OK);
-    apply_bt = g_object_get_data(right_h_button_box, GTK_STOCK_APPLY);
-    cancel_bt = g_object_get_data(right_h_button_box, GTK_STOCK_CANCEL);
+    ok_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK);
+    apply_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY);
+    cancel_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL);
 
     /* Connect the callbacks */
     g_signal_connect (airpcap_advanced_w, "delete_event", G_CALLBACK(window_delete_event_cb), airpcap_advanced_w);
@@ -2290,19 +2290,19 @@ display_airpcap_advanced_cb(GtkWidget *w, gpointer data)
 
 
     /* Store pointers to all widgets, for use by lookup_widget(). */
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_BLINK_KEY, blink_bt);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_CHANNEL_KEY,channel_cm);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_LINK_TYPE_KEY,capture_type_cm);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_FCS_CHECK_KEY, fcs_ck);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_FCS_FILTER_KEY, fcs_filter_cm);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_OK_KEY, ok_bt);
-    g_object_set_data (airpcap_advanced_w, AIRPCAP_ADVANCED_CANCEL_KEY, cancel_bt);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_BLINK_KEY, blink_bt);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_CHANNEL_KEY,channel_cm);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_LINK_TYPE_KEY,capture_type_cm);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_FCS_CHECK_KEY, fcs_ck);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_FCS_FILTER_KEY, fcs_filter_cm);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_OK_KEY, ok_bt);
+    g_object_set_data (G_OBJECT(airpcap_advanced_w), AIRPCAP_ADVANCED_CANCEL_KEY, cancel_bt);
 
     /*
      * I will need the toolbar and the main widget in some callback,
      * so I will add the toolbar pointer to the airpcap_advanced_w
      */
-    g_object_set_data(airpcap_advanced_w,AIRPCAP_TOOLBAR_KEY,toolbar);
+    g_object_set_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_TOOLBAR_KEY,toolbar);
 
     /* At the end, so that it appears completely all together ... */
     gtk_widget_show (airpcap_advanced_w);
@@ -2338,23 +2338,23 @@ on_advanced_ok_bt_clicked(GtkWidget *button, gpointer data _U_)
 
     /* Retrieve the GUI object pointers */
     airpcap_advanced_w			= GTK_WIDGET(data);
-    interface_combo				= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_INTERFACE_KEY));
-    channel_combo				= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_CHANNEL_KEY));
-    capture_combo				= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_LINK_TYPE_KEY));
-    crc_check					= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_FCS_CHECK_KEY));
-    wrong_crc_combo				= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_FCS_FILTER_KEY));
-    blink_bt					= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_BLINK_KEY));
-    cancel_bt					= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_CANCEL_KEY));
-    ok_bt						= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_OK_KEY));
-    advanced_bt					= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEY));
-
-    toolbar						= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_TOOLBAR_KEY));
+    interface_combo				= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_INTERFACE_KEY));
+    channel_combo				= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_CHANNEL_KEY));
+    capture_combo				= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_LINK_TYPE_KEY));
+    crc_check					= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_FCS_CHECK_KEY));
+    wrong_crc_combo				= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_FCS_FILTER_KEY));
+    blink_bt					= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_BLINK_KEY));
+    cancel_bt					= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_CANCEL_KEY));
+    ok_bt						= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_OK_KEY));
+    advanced_bt					= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEY));
+
+    toolbar						= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_TOOLBAR_KEY));
 
     /* retrieve toolbar info */
-    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_INTERFACE_KEY));
-    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_KEY));
-    toolbar_channel_offset_cb	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY));
-    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
+    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_INTERFACE_KEY));
+    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_KEY));
+    toolbar_channel_offset_cb	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY));
+    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
 
     /* Stop blinking ALL leds (go through the airpcap_if_list) */
     if (airpcap_if_selected != NULL)
@@ -2428,22 +2428,22 @@ on_advanced_cancel_bt_clicked(GtkWidget *button, gpointer data _U_)
 
     /* Retrieve the GUI object pointers */
     airpcap_advanced_w  = GTK_WIDGET(data);
-    interface_combo		= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_INTERFACE_KEY));
-    channel_combo		= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_CHANNEL_KEY));
-    capture_combo		= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_LINK_TYPE_KEY));
-    crc_check			= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_FCS_CHECK_KEY));
-    wrong_crc_combo		= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_FCS_FILTER_KEY));
-    blink_bt			= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_BLINK_KEY));
-    cancel_bt			= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_CANCEL_KEY));
-    ok_bt				= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_OK_KEY));
-    advanced_bt			= GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_ADVANCED_KEY));
-
-    toolbar = GTK_WIDGET(g_object_get_data(airpcap_advanced_w,AIRPCAP_TOOLBAR_KEY));
+    interface_combo		= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_INTERFACE_KEY));
+    channel_combo		= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_CHANNEL_KEY));
+    capture_combo		= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_LINK_TYPE_KEY));
+    crc_check			= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_FCS_CHECK_KEY));
+    wrong_crc_combo		= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_FCS_FILTER_KEY));
+    blink_bt			= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_BLINK_KEY));
+    cancel_bt			= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_CANCEL_KEY));
+    ok_bt				= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_OK_KEY));
+    advanced_bt			= GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEY));
+
+    toolbar = GTK_WIDGET(g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_TOOLBAR_KEY));
 
     /* retrieve toolbar info */
-    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_INTERFACE_KEY));
-    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_CHANNEL_KEY));
-    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
+    toolbar_if_lb			= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_INTERFACE_KEY));
+    toolbar_channel_cm		= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_CHANNEL_KEY));
+    toolbar_wrong_crc_cm	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_FCS_FILTER_KEY));
 
     /* Stop blinking ALL leds (go through the airpcap_if_list) */
     if (airpcap_if_selected != NULL)
@@ -2520,7 +2520,7 @@ display_airpcap_key_management_cb(GtkWidget *w, gpointer data)
 
     /* user data - RETRIEVE pointers of toolbar widgets */
     toolbar				  = GTK_WIDGET(data);
-    toolbar_decryption_ck = GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_DECRYPTION_KEY));
+    toolbar_decryption_ck = GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
 
     /* gray out the toolbar */
     gtk_widget_set_sensitive(toolbar,FALSE);
@@ -2724,9 +2724,9 @@ display_airpcap_key_management_cb(GtkWidget *w, gpointer data)
     gtk_button_box_set_layout (GTK_BUTTON_BOX (right_h_button_box),
                                GTK_BUTTONBOX_END);
 
-    ok_bt = g_object_get_data(right_h_button_box, GTK_STOCK_OK);
-    apply_bt = g_object_get_data(right_h_button_box, GTK_STOCK_APPLY);
-    cancel_bt = g_object_get_data(right_h_button_box, GTK_STOCK_CANCEL);
+    ok_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK);
+    apply_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY);
+    cancel_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL);
 
     /* Connect the callbacks */
     g_signal_connect (key_management_w, "delete_event", G_CALLBACK(window_delete_event_cb), key_management_w);
@@ -2748,20 +2748,20 @@ display_airpcap_key_management_cb(GtkWidget *w, gpointer data)
     /*window_set_cancel_button(key_management_w, ok_bt, window_cancel_button_cb);
     window_set_cancel_button(key_management_w, cancel_bt, window_cancel_button_cb);*/
 
-    g_object_set_data (key_management_w, AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY,key_ls_selected_item);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY,key_ls_selected_item);
 
     /* Store pointers to all widgets, for use by lookup_widget(). */
-    g_object_set_data (key_management_w, AIRPCAP_ADVANCED_WEP_DECRYPTION_KEY, enable_decryption_en);
-    g_object_set_data (key_management_w, AIRPCAP_ADVANCED_KEYLIST_KEY, key_ls);
-    g_object_set_data (key_management_w, AIRPCAP_ADVANCED_OK_KEY, ok_bt);
-    g_object_set_data (key_management_w, AIRPCAP_ADVANCED_CANCEL_KEY, cancel_bt);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_ADVANCED_WEP_DECRYPTION_KEY, enable_decryption_en);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_ADVANCED_KEYLIST_KEY, key_ls);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_ADVANCED_OK_KEY, ok_bt);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_ADVANCED_CANCEL_KEY, cancel_bt);
 
     /*
      * I will need the toolbar and the main widget in some callback,
      * so I will add the toolbar pointer to the key_management_w
      */
-    g_object_set_data(key_management_w,AIRPCAP_TOOLBAR_KEY,toolbar);
-    g_object_set_data (key_management_w, AIRPCAP_TOOLBAR_DECRYPTION_KEY, toolbar_decryption_ck);
+    g_object_set_data(G_OBJECT(key_management_w),AIRPCAP_TOOLBAR_KEY,toolbar);
+    g_object_set_data (G_OBJECT(key_management_w), AIRPCAP_TOOLBAR_DECRYPTION_KEY, toolbar_decryption_ck);
 
     /* FIRST OF ALL, CHECK THE KEY COLLECTIONS */
     /*
@@ -2843,18 +2843,18 @@ on_key_management_cancel_bt_clicked(GtkWidget *button, gpointer data _U_)
 
     /* Retrieve the GUI object pointers */
     key_management_w	= GTK_WIDGET(data);
-    cancel_bt			= GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_CANCEL_KEY));
-    ok_bt				= GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_OK_KEY));
-    key_ls				= GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY));
-    key_management_bt   = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEY));
+    cancel_bt			= GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_CANCEL_KEY));
+    ok_bt				= GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_OK_KEY));
+    key_ls				= GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY));
+    key_management_bt   = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEY));
 
-    toolbar = GTK_WIDGET(g_object_get_data(key_management_w,AIRPCAP_TOOLBAR_KEY));
+    toolbar = GTK_WIDGET(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_TOOLBAR_KEY));
 
     /* retrieve toolbar info */
-    toolbar_decryption_ck	= GTK_WIDGET(g_object_get_data(toolbar,AIRPCAP_TOOLBAR_DECRYPTION_KEY));
+    toolbar_decryption_ck	= GTK_WIDGET(g_object_get_data(G_OBJECT(toolbar),AIRPCAP_TOOLBAR_DECRYPTION_KEY));
 
     /* Retrieve the selected row item pointer... */
-    selected_item			= (airpcap_key_ls_selected_info_t*)(g_object_get_data(key_management_w,AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY));
+    selected_item			= (airpcap_key_ls_selected_info_t*)(g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_SELECTED_KEY_LIST_ITEM_KEY));
     /* And free it */
     g_free(selected_item);
 
@@ -3009,12 +3009,12 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data)
     g_signal_connect (keys_check_w, "destroy", G_CALLBACK(on_keys_check_w_destroy), keys_check_w);
 
     /* Store pointers to all widgets, for use by lookup_widget(). */
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY,w);
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY,merge_rb);
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY,keep_rb);
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY,import_rb);
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY,ignore_rb);
-    g_object_set_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_GROUP_KEY,radio_bt_group);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY,w);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY,merge_rb);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY,keep_rb);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY,import_rb);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY,ignore_rb);
+    g_object_set_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_GROUP_KEY,radio_bt_group);
 
     gtk_widget_set_sensitive(top_level,FALSE);
     gtk_widget_show(keys_check_w);
@@ -3029,14 +3029,14 @@ on_keys_check_cancel_bt_clicked (GtkWidget *button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
 
     /* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading,
        and is not NULL if it was called when the Key Management widget has been clicked */
     if (key_management_w != NULL)
     {
         /*  ... */
-        key_ls = g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+        key_ls = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
         airpcap_fill_key_list(key_ls);
         gtk_widget_show (key_management_w);
     }
@@ -3057,11 +3057,11 @@ on_keys_check_ok_bt_clicked (GtkWidget *button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
-    merge_rb  = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY);
-    keep_rb   = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY);
-    import_rb = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY);
-    ignore_rb = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
+    merge_rb  = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY);
+    keep_rb   = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY);
+    import_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY);
+    ignore_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY);
 
     /* Find out which radio button is selected and call the correct function */
     if (GTK_TOGGLE_BUTTON(merge_rb)->active) on_merge_bt_clicked (merge_rb,keys_check_w);
@@ -3096,7 +3096,7 @@ on_keep_bt_clicked (GtkWidget *button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
 
     n_adapters = g_list_length(airpcap_if_list);
 
@@ -3125,7 +3125,7 @@ on_keep_bt_clicked (GtkWidget *button, gpointer user_data)
     if (key_management_w != NULL)
     {
         /*  ... */
-        key_ls = g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+        key_ls = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
         airpcap_fill_key_list(key_ls);
         gtk_widget_show (key_management_w);
     }
@@ -3156,7 +3156,7 @@ on_merge_bt_clicked (GtkWidget * button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
 
     n_adapters = g_list_length(airpcap_if_list);
 
@@ -3206,7 +3206,7 @@ on_merge_bt_clicked (GtkWidget * button, gpointer user_data)
     if (key_management_w != NULL)
     {
         /*  ... */
-        key_ls = g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+        key_ls = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
         airpcap_fill_key_list(key_ls);
         gtk_widget_show (key_management_w);
     }
@@ -3238,7 +3238,7 @@ on_import_bt_clicked (GtkWidget * button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
 
     n_adapters = g_list_length(airpcap_if_list);
 
@@ -3285,7 +3285,7 @@ on_import_bt_clicked (GtkWidget * button, gpointer user_data)
     if (key_management_w != NULL)
     {
         /*  ... */
-        key_ls = g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+        key_ls = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
         airpcap_fill_key_list(key_ls);
         gtk_widget_show (key_management_w);
     }
@@ -3301,14 +3301,14 @@ on_ignore_bt_clicked (GtkWidget * button, gpointer user_data)
 
     keys_check_w = GTK_WIDGET(user_data);
 
-    key_management_w = g_object_get_data(keys_check_w,AIRPCAP_CHECK_WINDOW_KEY);
+    key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY);
 
     /* w may be NULL if airpcap_keys_check_w() has been called while wireshark was loading,
        and is not NULL if it was called when the Key Management widget has been clicked */
     if (key_management_w != NULL)
     {
         /*  ... */
-        key_ls = g_object_get_data(key_management_w,AIRPCAP_ADVANCED_KEYLIST_KEY);
+        key_ls = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY);
         airpcap_fill_key_list(key_ls);
         gtk_widget_show (key_management_w);
     }
diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index 0846a1e2ae..8044da01c5 100644
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -1267,7 +1267,7 @@ airpcap_set_toolbar_no_if(GtkWidget* w)
 
     toolbar_tb = w;
 
-    if_description_lb	    = g_object_get_data(G_OBJECT(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
+    if_description_lb	    = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
     channel_lb			      = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
     channel_cb			      = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
     channel_offset_lb			= g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);