commit 36576a5cb60661c371fb796ea6a3cd16e67e0e74
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jun 7 11:25:04 2016 +0200
network: Update security page for recent changes
.../network/connection-editor/ce-page-security.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/panels/network/connection-editor/ce-page-security.c
b/panels/network/connection-editor/ce-page-security.c
index 8e64c7a..041afcd 100644
--- a/panels/network/connection-editor/ce-page-security.c
+++ b/panels/network/connection-editor/ce-page-security.c
@@ -241,7 +241,7 @@ finish_setup (CEPageSecurity *page)
if (sws)
default_type = get_default_type_for_security (sws);
- sec_model = gtk_list_store_new (3, G_TYPE_STRING, wireless_security_get_g_type (), G_TYPE_BOOLEAN);
+ sec_model = gtk_list_store_new (3, G_TYPE_STRING, wireless_security_get_type (), G_TYPE_BOOLEAN);
if (nm_utils_security_valid (NMU_SEC_NONE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
gtk_list_store_insert_with_values (sec_model, &iter, -1,
@@ -389,11 +389,9 @@ validate (CEPage *page,
if (ssid) {
/* FIXME: get failed property and error out of wifi security objects */
- valid = wireless_security_validate (sec, ssid);
+ valid = wireless_security_validate (sec, error);
if (valid)
wireless_security_fill_connection (sec, connection);
- else
- g_set_error (error, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_SETTING, "Invalid Wi-Fi security");
} else {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING,
"Missing SSID");
valid = FALSE;