network: Split up a combined setter into multiple methods

4 files changed, 61 insertions, 37 deletions

diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c
index 55e818b49..e7b2ff91c 100644
--- a/panels/network/wireless-security/eap-method-leap.c
+++ b/panels/network/wireless-security/eap-method-leap.c
@@ -171,11 +171,9 @@ widgets_realized (EAPMethodLEAP *self)
 static void
 widgets_unrealized (EAPMethodLEAP *self)
 {
-	wireless_security_set_userpass (self->ws_parent,
-	                                gtk_entry_get_text (self->username_entry),
-	                                gtk_entry_get_text (self->password_entry),
-	                                (gboolean) -1,
-	                                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->show_password_check)));
+	wireless_security_set_username (self->ws_parent, gtk_entry_get_text (self->username_entry));
+	wireless_security_set_password (self->ws_parent, gtk_entry_get_text (self->password_entry));
+	wireless_security_set_show_password (self->ws_parent, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->show_password_check)));
 }
 
 static void
diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c
index 112583877..01b1ef3de 100644
--- a/panels/network/wireless-security/eap-method-simple.c
+++ b/panels/network/wireless-security/eap-method-simple.c
@@ -271,11 +271,10 @@ widgets_realized (EAPMethodSimple *self)
 static void
 widgets_unrealized (EAPMethodSimple *self)
 {
-	wireless_security_set_userpass (self->ws_parent,
-	                                gtk_entry_get_text (self->username_entry),
-	                                gtk_entry_get_text (self->password_entry),
-	                                always_ask_selected (self->password_entry),
-	                                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->show_password_check)));
+	wireless_security_set_username (self->ws_parent, gtk_entry_get_text (self->username_entry));
+	wireless_security_set_password (self->ws_parent, gtk_entry_get_text (self->password_entry));
+	wireless_security_set_always_ask (self->ws_parent, always_ask_selected (self->password_entry));
+	wireless_security_set_show_password (self->ws_parent, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->show_password_check)));
 }
 
 static void
diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c
index fed7e2025..4a388bb07 100644
--- a/panels/network/wireless-security/wireless-security.c
+++ b/panels/network/wireless-security/wireless-security.c
@@ -145,6 +145,17 @@ wireless_security_adhoc_compatible (WirelessSecurity *self)
 		return TRUE;
 }
 
+void
+wireless_security_set_username (WirelessSecurity *self, const gchar *username)
+{
+	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
+
+	g_return_if_fail (WIRELESS_IS_SECURITY (self));
+
+	g_clear_pointer (&priv->username, g_free);
+	priv->username = g_strdup (username);
+}
+
 const gchar *
 wireless_security_get_username (WirelessSecurity *self)
 {
@@ -155,6 +166,20 @@ wireless_security_get_username (WirelessSecurity *self)
 	return priv->username;
 }
 
+void
+wireless_security_set_password (WirelessSecurity *self, const gchar *password)
+{
+	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
+
+	g_return_if_fail (WIRELESS_IS_SECURITY (self));
+
+	if (priv->password)
+		memset (priv->password, 0, strlen (priv->password));
+
+	g_clear_pointer (&priv->password, g_free);
+	priv->password = g_strdup (password);
+}
+
 const gchar *
 wireless_security_get_password (WirelessSecurity *self)
 {
@@ -165,47 +190,44 @@ wireless_security_get_password (WirelessSecurity *self)
 	return priv->password;
 }
 
-gboolean
-wireless_security_get_always_ask (WirelessSecurity *self)
+void
+wireless_security_set_always_ask (WirelessSecurity *self, gboolean always_ask)
 {
 	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
 
-	g_return_val_if_fail (WIRELESS_IS_SECURITY (self), FALSE);
+	g_return_if_fail (WIRELESS_IS_SECURITY (self));
 
-	return priv->always_ask;
+	priv->always_ask = always_ask;
 }
 
 gboolean
-wireless_security_get_show_password (WirelessSecurity *self)
+wireless_security_get_always_ask (WirelessSecurity *self)
 {
 	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
 
 	g_return_val_if_fail (WIRELESS_IS_SECURITY (self), FALSE);
 
-	return priv->show_password;
+	return priv->always_ask;
 }
 
 void
-wireless_security_set_userpass (WirelessSecurity *self,
-                                const char *user,
-                                const char *password,
-                                gboolean always_ask,
-                                gboolean show_password)
+wireless_security_set_show_password (WirelessSecurity *self, gboolean show_password)
 {
 	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
 
-	g_clear_pointer (&priv->username, g_free);
-	priv->username = g_strdup (user);
+	g_return_if_fail (WIRELESS_IS_SECURITY (self));
 
-	if (priv->password)
-		memset (priv->password, 0, strlen (priv->password));
+	priv->show_password = show_password;
+}
 
-	g_clear_pointer (&priv->password, g_free);
-	priv->password = g_strdup (password);
+gboolean
+wireless_security_get_show_password (WirelessSecurity *self)
+{
+	WirelessSecurityPrivate *priv = wireless_security_get_instance_private (self);
 
-	if (always_ask != (gboolean) -1)
-		priv->always_ask = always_ask;
-	priv->show_password = show_password;
+	g_return_val_if_fail (WIRELESS_IS_SECURITY (self), FALSE);
+
+	return priv->show_password;
 }
 
 void
@@ -319,7 +341,10 @@ ws_802_1x_auth_combo_init (WirelessSecurity *self,
 				always_ask = !!(flags & NM_SETTING_SECRET_FLAG_NOT_SAVED);
 		}
 	}
-	wireless_security_set_userpass (self, user, password, always_ask, FALSE);
+	wireless_security_set_username (self, user);
+	wireless_security_set_password (self, password);
+	wireless_security_set_always_ask (self, always_ask);
+	wireless_security_set_show_password (self, FALSE);
 
 	auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_type ());
 
diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h
index fbe0fd4d2..5ba8a8b54 100644
--- a/panels/network/wireless-security/wireless-security.h
+++ b/panels/network/wireless-security/wireless-security.h
@@ -50,19 +50,21 @@ void wireless_security_fill_connection (WirelessSecurity *sec,
 
 gboolean wireless_security_adhoc_compatible (WirelessSecurity *sec);
 
+void wireless_security_set_username (WirelessSecurity *sec, const gchar *username);
+
 const gchar *wireless_security_get_username (WirelessSecurity *sec);
 
+void wireless_security_set_password (WirelessSecurity *sec, const gchar *password);
+
 const gchar *wireless_security_get_password (WirelessSecurity *sec);
 
+void wireless_security_set_always_ask (WirelessSecurity *sec, gboolean always_ask);
+
 gboolean wireless_security_get_always_ask (WirelessSecurity *sec);
 
-gboolean wireless_security_get_show_password (WirelessSecurity *sec);
+void wireless_security_set_show_password (WirelessSecurity *sec, gboolean show_password);
 
-void wireless_security_set_userpass (WirelessSecurity *sec,
-                                     const char *user,
-                                     const char *password,
-                                     gboolean always_ask,
-                                     gboolean show_password);
+gboolean wireless_security_get_show_password (WirelessSecurity *sec);
 
 /* Below for internal use only */