summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2016-06-14 14:11:25 +0200
committerBastien Nocera <hadess@hadess.net>2016-08-30 17:15:33 +0200
commitb0329f8ef6c025c9c20453132297c9772cb29efc (patch)
tree838dbcd34ba9a1fc224c0bba59e239c0e63be716
parent73a8d38946ee09d790e87f19df45fc1c6174c043 (diff)
downloadgnome-control-center-b0329f8ef6c025c9c20453132297c9772cb29efc.tar.gz
network: Return better error when 8021x security is invalid
Rather than the generic "Invalid 802.1x security". https://bugzilla.gnome.org/show_bug.cgi?id=769230
-rw-r--r--panels/network/connection-editor/ce-page-8021x-security.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c
index 2a7d2ca99..f7d31969a 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.c
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
@@ -124,7 +124,7 @@ validate (CEPage *cepage, NMConnection *connection, GError **error)
NMSetting *s_8021x;
/* FIXME: get failed property and error out of wireless security objects */
- valid = wireless_security_validate (page->security, NULL);
+ valid = wireless_security_validate (page->security, error);
if (valid) {
NMSetting *s_con;
@@ -144,8 +144,7 @@ validate (CEPage *cepage, NMConnection *connection, GError **error)
nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
g_object_unref (tmp_connection);
- } else
- g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, "Invalid 802.1x security");
+ }
} else {
nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
valid = TRUE;