[network-manager-applet/nma-1-0: 1/8] wireless-security: drop the "ssid" parameter from wireless_security_validate()

[Thomas Haller <thaller src gnome org>]

commit 579b1557c95ae6ad532d779282a854da6baf9042
Author: Thomas Haller <thaller redhat com>
Date:   Sat Sep 12 13:18:59 2015 +0200

    wireless-security: drop the "ssid" parameter from wireless_security_validate()
    
    This is a partial backport of commit 8605884e04be1b57aedfc7e54077180d5640c9ce.

 src/connection-editor/page-8021x-security.c |    2 +-
 src/connection-editor/page-wifi-security.c  |    2 +-
 src/ethernet-dialog.c                       |    2 +-
 src/libnm-gtk/nm-wifi-dialog.c              |    4 ++--
 src/wireless-security/wireless-security.c   |    4 ++--
 src/wireless-security/wireless-security.h   |    4 ++--
 src/wireless-security/ws-dynamic-wep.c      |    2 +-
 src/wireless-security/ws-leap.c             |    2 +-
 src/wireless-security/ws-wep-key.c          |    2 +-
 src/wireless-security/ws-wpa-eap.c          |    2 +-
 src/wireless-security/ws-wpa-psk.c          |    2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index 5aca1e3..69968aa 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -153,7 +153,7 @@ validate (CEPage *page, NMConnection *connection, GError **error)
                NMSetting *s_8021x;
 
                /* FIXME: get failed property and error out of wireless security objects */
-               valid = wireless_security_validate (priv->security, NULL);
+               valid = wireless_security_validate (priv->security);
                if (valid) {
                        NMSetting *s_con;
 
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index e0d00b8..d2d09c6 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -485,7 +485,7 @@ validate (CEPage *page, NMConnection *connection, GError **error)
 
                if (ssid) {
                        /* FIXME: get failed property and error out of wifi security objects */
-                       valid = wireless_security_validate (sec, ssid);
+                       valid = wireless_security_validate (sec);
                        if (valid)
                                wireless_security_fill_connection (sec, connection);
                        else
diff --git a/src/ethernet-dialog.c b/src/ethernet-dialog.c
index 26d0053..9fd7c1a 100644
--- a/src/ethernet-dialog.c
+++ b/src/ethernet-dialog.c
@@ -40,7 +40,7 @@ stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
 {
        GtkWidget *button = GTK_WIDGET (user_data);
        
-       gtk_widget_set_sensitive (button, wireless_security_validate (sec, NULL));
+       gtk_widget_set_sensitive (button, wireless_security_validate (sec));
 }
 
 static void
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 48310b0..aef1bc3 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -288,7 +288,7 @@ stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
        }
 
        if (ssid) {
-               valid = wireless_security_validate (sec, ssid);
+               valid = wireless_security_validate (sec);
                if (free_ssid)
                        g_byte_array_free (ssid, TRUE);
        }
@@ -328,7 +328,7 @@ ssid_entry_changed (GtkWidget *entry, gpointer user_data)
                gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
 
        if (sec) {
-               valid = wireless_security_validate (sec, ssid);
+               valid = wireless_security_validate (sec);
                wireless_security_unref (sec);
        } else {
                valid = TRUE;
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index 7e009d5..2af073c 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -68,12 +68,12 @@ wireless_security_changed_cb (GtkWidget *ignored, gpointer user_data)
 }
 
 gboolean
-wireless_security_validate (WirelessSecurity *sec, const GByteArray *ssid)
+wireless_security_validate (WirelessSecurity *sec)
 {
        g_return_val_if_fail (sec != NULL, FALSE);
 
        g_assert (sec->validate);
-       return (*(sec->validate)) (sec, ssid);
+       return (*(sec->validate)) (sec);
 }
 
 void
diff --git a/src/wireless-security/wireless-security.h b/src/wireless-security/wireless-security.h
index 4a1a4fe..4aac30a 100644
--- a/src/wireless-security/wireless-security.h
+++ b/src/wireless-security/wireless-security.h
@@ -36,7 +36,7 @@ typedef void (*WSAddToSizeGroupFunc) (WirelessSecurity *sec, GtkSizeGroup *group
 typedef void (*WSFillConnectionFunc) (WirelessSecurity *sec, NMConnection *connection);
 typedef void (*WSUpdateSecretsFunc)  (WirelessSecurity *sec, NMConnection *connection);
 typedef void (*WSDestroyFunc)        (WirelessSecurity *sec);
-typedef gboolean (*WSValidateFunc)   (WirelessSecurity *sec, const GByteArray *ssid);
+typedef gboolean (*WSValidateFunc)   (WirelessSecurity *sec);
 typedef GtkWidget * (*WSNagUserFunc) (WirelessSecurity *sec);
 
 struct _WirelessSecurity {
@@ -68,7 +68,7 @@ void wireless_security_set_changed_notify (WirelessSecurity *sec,
                                            WSChangedFunc func,
                                            gpointer user_data);
 
-gboolean wireless_security_validate (WirelessSecurity *sec, const GByteArray *ssid);
+gboolean wireless_security_validate (WirelessSecurity *sec);
 
 void wireless_security_add_to_size_group (WirelessSecurity *sec,
                                           GtkSizeGroup *group);
diff --git a/src/wireless-security/ws-dynamic-wep.c b/src/wireless-security/ws-dynamic-wep.c
index e7c85fa..e224277 100644
--- a/src/wireless-security/ws-dynamic-wep.c
+++ b/src/wireless-security/ws-dynamic-wep.c
@@ -44,7 +44,7 @@ destroy (WirelessSecurity *parent)
 }
 
 static gboolean
-validate (WirelessSecurity *parent, const GByteArray *ssid)
+validate (WirelessSecurity *parent)
 {
        return ws_802_1x_validate (parent, "dynamic_wep_auth_combo");
 }
diff --git a/src/wireless-security/ws-leap.c b/src/wireless-security/ws-leap.c
index 34e6257..8a4d76e 100644
--- a/src/wireless-security/ws-leap.c
+++ b/src/wireless-security/ws-leap.c
@@ -47,7 +47,7 @@ show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)
 }
 
 static gboolean
-validate (WirelessSecurity *parent, const GByteArray *ssid)
+validate (WirelessSecurity *parent)
 {
        GtkWidget *entry;
        const char *text;
diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
index 2399ace..ba1676f 100644
--- a/src/wireless-security/ws-wep-key.c
+++ b/src/wireless-security/ws-wep-key.c
@@ -92,7 +92,7 @@ destroy (WirelessSecurity *parent)
 }
 
 static gboolean
-validate (WirelessSecurity *parent, const GByteArray *ssid)
+validate (WirelessSecurity *parent)
 {
        WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
        GtkWidget *entry;
diff --git a/src/wireless-security/ws-wpa-eap.c b/src/wireless-security/ws-wpa-eap.c
index 6b911c1..f4789ad 100644
--- a/src/wireless-security/ws-wpa-eap.c
+++ b/src/wireless-security/ws-wpa-eap.c
@@ -45,7 +45,7 @@ destroy (WirelessSecurity *parent)
 }
 
 static gboolean
-validate (WirelessSecurity *parent, const GByteArray *ssid)
+validate (WirelessSecurity *parent)
 {
        return ws_802_1x_validate (parent, "wpa_eap_auth_combo");
 }
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
index 5cd658a..e2fca37 100644
--- a/src/wireless-security/ws-wpa-psk.c
+++ b/src/wireless-security/ws-wpa-psk.c
@@ -51,7 +51,7 @@ show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)
 }
 
 static gboolean
-validate (WirelessSecurity *parent, const GByteArray *ssid)
+validate (WirelessSecurity *parent)
 {
        GtkWidget *entry;
        const char *key;