Fix a key entry bug in the decryption key dialog. Remove some unused /

unnecessary functions. Clean up code in a couple of places.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28908 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index dbcdb20b06ca54dd29ac465dcc0b465b6046c527..43f0493ac2a3e1216953b65ac13347cb8249f06e 100644 (file)
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -576,7 +576,7 @@ on_reset_configuration_bt_clicked(GtkWidget *button _U_, gpointer data _U_)
 static void
 on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 {
-    GtkWidget  *type_cm,
+    GtkWidget  *type_cb,
     *key_en,
     *ssid_en;
 
@@ -601,7 +601,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 
     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);
+    type_cb = 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);
 
@@ -610,7 +610,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 
     keys_in_list = GTK_CLIST(key_ls)->rows;
 
-    type_entered = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(type_cm)->entry)));
+    type_entered = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_cb));
     key_entered  = g_strdup(gtk_entry_get_text(GTK_ENTRY(key_en)));
     ssid_entered = g_strdup(gtk_entry_get_text(GTK_ENTRY(ssid_en)));
 
@@ -619,6 +619,10 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
     new_key_string = g_string_new(key_entered);
     new_ssid_string = g_string_new(ssid_entered);
 
+    g_free(type_entered);
+    g_free(key_entered );
+    g_free(ssid_entered);
+
     g_strchug(new_key_string->str);
     g_strchomp(new_key_string->str);
 
@@ -637,9 +641,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -651,9 +652,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -667,9 +665,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
                 g_string_free(new_key_string, TRUE);
                 g_string_free(new_ssid_string,TRUE);
 
-                g_free(type_entered);
-                g_free(key_entered );
-                g_free(ssid_entered);
                 return;
             }
         }
@@ -692,9 +687,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -709,9 +701,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -733,9 +722,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -749,9 +735,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
                 g_string_free(new_key_string, TRUE);
                 g_string_free(new_ssid_string,TRUE);
 
-                g_free(type_entered);
-                g_free(key_entered );
-                g_free(ssid_entered);
                 return;
             }
         }
@@ -770,10 +753,6 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
     g_string_free(new_key_string, TRUE);
     g_string_free(new_ssid_string,TRUE);
 
-    g_free(type_entered);
-    g_free(key_entered );
-    g_free(ssid_entered);
-
     window_destroy(GTK_WIDGET(data));
     return;
 }
@@ -784,7 +763,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 static void
 on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 {
-    GtkWidget  *type_cm,
+    GtkWidget  *type_cb,
     *key_en,
     *ssid_en;
 
@@ -809,7 +788,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 
     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);
+    type_cb = 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);
 
@@ -818,7 +797,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
 
     keys_in_list = GTK_CLIST(key_ls)->rows;
 
-    type_entered = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(type_cm)->entry)));
+    type_entered = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_cb));
     key_entered  = g_strdup(gtk_entry_get_text(GTK_ENTRY(key_en)));
     ssid_entered = g_strdup(gtk_entry_get_text(GTK_ENTRY(ssid_en)));
 
@@ -827,6 +806,10 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
     new_key_string = g_string_new(key_entered);
     new_ssid_string = g_string_new(ssid_entered);
 
+    g_free(type_entered);
+    g_free(key_entered );
+    g_free(ssid_entered);
+
     g_strchug(new_key_string->str);
     g_strchomp(new_key_string->str);
 
@@ -845,9 +828,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -859,9 +839,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -875,9 +852,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
                 g_string_free(new_key_string, TRUE);
                 g_string_free(new_ssid_string,TRUE);
 
-                g_free(type_entered);
-                g_free(key_entered );
-                g_free(ssid_entered);
                 return;
             }
         }
@@ -900,9 +874,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -917,9 +888,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -941,9 +909,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
             g_string_free(new_key_string, TRUE);
             g_string_free(new_ssid_string,TRUE);
 
-            g_free(type_entered);
-            g_free(key_entered );
-            g_free(ssid_entered);
             return;
         }
 
@@ -957,9 +922,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
                 g_string_free(new_key_string, TRUE);
                 g_string_free(new_ssid_string,TRUE);
 
-                g_free(type_entered);
-                g_free(key_entered );
-                g_free(ssid_entered);
                 return;
             }
         }
@@ -978,10 +940,6 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_)
     g_string_free(new_key_string, TRUE);
     g_string_free(new_ssid_string,TRUE);
 
-    g_free(type_entered);
-    g_free(key_entered );
-    g_free(ssid_entered);
-
     window_destroy(GTK_WIDGET(data));
     return;
 }

diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index ef8dd3caa59332527e6432ca91c14ec3f656082c..299f77c9c2bb598c86f071c876b529e02b4ba7e6 100644 (file)
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -146,7 +146,6 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info)
                gtk_widget_set_sensitive(airpcap_toolbar_decryption,FALSE);
                gtk_widget_set_sensitive(airpcap_toolbar_decryption_lb,FALSE);
                gtk_widget_set_sensitive(airpcap_toolbar_keys_button,FALSE);
-               airpcap_set_toolbar_no_if(airpcap_tb);
     }
 }
 
@@ -242,7 +241,6 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info)
                gtk_widget_set_sensitive(airpcap_toolbar_decryption,TRUE);
                gtk_widget_set_sensitive(airpcap_toolbar_decryption_lb,TRUE);
                gtk_widget_set_sensitive(airpcap_toolbar_keys_button,TRUE);
-               airpcap_set_toolbar_no_if(airpcap_tb);
                change_airpcap_settings = FALSE;
     }
 }
@@ -486,31 +484,6 @@ airpcap_get_link_name(AirpcapLinkType lt)
     return NULL;
 }
 
-/*
- * Sets the entry of the link type combo using the AirpcapLinkType.
- */
-void
-airpcap_link_type_combo_set_by_type(GtkWidget* c, AirpcapLinkType type)
-{
-    gchar* s;
-
-    s = airpcap_get_link_name(type);
-    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(c)->entry),s);
-}
-
-/*
- * Retrieves the name in link type the combo entry.
- */
-AirpcapLinkType
-airpcap_link_type_combo_get_type(GtkWidget* c)
-{
-    const gchar* s;
-
-    s = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(c)->entry));
-
-    return airpcap_get_link_type(s);
-}
-
 /*
  * Sets the entry of the validation combo using the AirpcapValidationType.
  */
@@ -1232,50 +1205,6 @@ airpcap_enable_toolbar_widgets(GtkWidget* w, gboolean en)
     return;
 }
 
-/*
- * This function sets up the correct airpcap toolbar that must
- * be displayed when no airpcap if is found on the system...
- */
-void
-airpcap_set_toolbar_no_if(GtkWidget* w)
-{
-    GtkWidget  *toolbar_tb,
-               *if_description_lb,
-               *toolbar_channel_cb,
-               *channel_lb,
-    *channel_offset_cb,
-               *channel_offset_lb,
-               *fcs_cb,
-               *fcs_lb,
-               *advanced_bt;
-
-    if(w == NULL)
-       return;
-
-    toolbar_tb = w;
-
-    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);
-    toolbar_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);
-    channel_offset_cb           = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
-    fcs_lb                      = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
-    fcs_cb                      = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
-    advanced_bt                 = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
-
-    if(fcs_cb != NULL)              gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(fcs_cb)->entry),"");
-    if(toolbar_channel_cb != NULL)  gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(toolbar_channel_cb)->entry),"");
-    if(channel_offset_cb != NULL)   gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(channel_offset_cb)->entry),"");
-    if(if_description_lb != NULL)   gtk_label_set_text(GTK_LABEL(if_description_lb),"Current Wireless Interface: None");
-
-    /*if(if_description_lb != NULL)    gtk_widget_set_sensitive(if_description_lb,FALSE);
-    if(channel_lb != NULL)                     gtk_widget_set_sensitive(channel_lb,FALSE);
-    if(channel_cb != NULL)                     gtk_widget_set_sensitive(channel_cb,FALSE);
-    if(fcs_lb != NULL)                         gtk_widget_set_sensitive(fcs_lb,FALSE);
-    if(fcs_cb != NULL)                         gtk_widget_set_sensitive(fcs_cb,FALSE);
-    if(advanced_bt != NULL)                    gtk_widget_set_sensitive(advanced_bt,FALSE);*/
-}
-
 #endif /* HAVE_AIRPCAP */
 
 /*

diff --git a/gtk/airpcap_gui_utils.h b/gtk/airpcap_gui_utils.h
index 6b99c21c7dbf1bfbc340ac818aff2519cf2a4619..00c8ed59abf71dc2db5274a0264fcfa7e1b21560 100644 (file)
--- a/gtk/airpcap_gui_utils.h
+++ b/gtk/airpcap_gui_utils.h
@@ -127,18 +127,6 @@ airpcap_get_link_type(const gchar* name);
 gchar*
 airpcap_get_link_name(AirpcapLinkType lt);
 
-/*
- * Sets the entry of the link type combo using the AirpcapLinkType.
- */
-void
-airpcap_link_type_combo_set_by_type(GtkWidget* c, AirpcapLinkType type);
-
-/*
- * Retrieves the name in link type the combo entry.
- */
-AirpcapLinkType
-airpcap_link_type_combo_get_type(GtkWidget* c);
-
 /*
  * Sets the entry of the validation combo using the AirpcapValidationType.
  */
@@ -250,11 +238,4 @@ airpcap_save_decryption_keys(GList* key_list, GList* adapters_list);
 void
 airpcap_enable_toolbar_widgets(GtkWidget* w, gboolean en);
 
-/*
- * This function sets up the correct airpcap toolbar that must
- * be displayed when no airpcap if is found on the system...
- */
-void
-airpcap_set_toolbar_no_if(GtkWidget* w);
-
 #endif

diff --git a/gtk/main_airpcap_toolbar.c b/gtk/main_airpcap_toolbar.c
index 2da76b8d1f35a60f8833e2d1bf028fa818a4cc9c..fe26a440e53846130d4bb7b835a7326d2c50f80e 100644 (file)
--- a/gtk/main_airpcap_toolbar.c
+++ b/gtk/main_airpcap_toolbar.c
@@ -292,7 +292,7 @@ GtkWidget *airpcap_toolbar_new()
                               "", "Private");
     gtk_widget_show(fcs_filter_lb);
 
-    /* FCS filter combo */
+    /* FCS filter combo box */
     fcs_filter_cb = gtk_combo_box_new_text();
     g_object_set_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY,fcs_filter_cb);
     gtk_toolbar_append_widget(GTK_TOOLBAR(airpcap_tb), fcs_filter_cb,