From b0329f8ef6c025c9c20453132297c9772cb29efc Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 14 Jun 2016 14:11:25 +0200 Subject: [PATCH] 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 --- panels/network/connection-editor/ce-page-8021x-security.c | 5 ++--- 1 file 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;