applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Update security page for recent changes

Browse source
This commit is contained in:
Bastien Nocera 2016-06-07 11:25:04 +02:00
parent e6bccd6646
commit 36576a5cb6
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
panels/network/connection-editor/ce-page-security.c
View file

@ -241,7 +241,7 @@ finish_setup (CEPageSecurity *page)
if (sws) if (sws)
default_type = get_default_type_for_security (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)) { 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, gtk_list_store_insert_with_values (sec_model, &iter, -1,
@ -389,11 +389,9 @@ validate (CEPage *page,
if (ssid) { if (ssid) {
/* FIXME: get failed property and error out of wifi security objects */ /* 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) if (valid)
wireless_security_fill_connection (sec, connection); wireless_security_fill_connection (sec, connection);
else
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, "Invalid Wi-Fi security");
} else { } else {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, "Missing SSID"); g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, "Missing SSID");
valid = FALSE; valid = FALSE;