diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-21 22:30:31 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-28 17:17:17 -0400 |
| commit | 9e5c7d915b837e79a2f6d64a7d89bf2a2dec2f50 (patch) | |
| tree | 5a57c561a0a6f84df7630b4fa599fb6695f448d9 /libnm-core/nm-setting-wireless-security.c | |
| parent | b108790833e4829586cf42a60a60a783fe535608 (diff) | |
| download | NetworkManager-9e5c7d915b837e79a2f6d64a7d89bf2a2dec2f50.tar.gz | |
libnm-core: make nm_setting_verify() take an NMConnection
nm_setting_verify() took a GSList of other NMSettings, but really it
would just be simpler all around to pass the NMConnection instead...
This means that several formerly NMSetting-branded functions that
operated on lists-of-settings now get replaced with
NMConnection-branded functions instead.
Diffstat (limited to 'libnm-core/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless-security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index f66722b270..35ef2fdcbe 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -844,7 +844,7 @@ no_secrets: } static gboolean -verify (NMSetting *setting, GSList *all_settings, GError **error) +verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (setting); NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self); @@ -904,7 +904,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) if ( (strcmp (priv->key_mgmt, "ieee8021x") == 0) || (strcmp (priv->key_mgmt, "wpa-eap") == 0)) { /* Need an 802.1x setting too */ - if (!nm_setting_find_in_list (all_settings, NM_SETTING_802_1X_SETTING_NAME)) { + if (connection && !nm_connection_get_setting_802_1x (connection)) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, |