diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
| commit | 229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch) | |
| tree | edfc7357b6494a5c0cb016bb88d61b623daa9876 /libnm-core/nm-setting-wireless-security.c | |
| parent | 6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff) | |
| parent | 7514efc2f38c9ace4557d4e69d68e7d380389030 (diff) | |
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'libnm-core/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless-security.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index 64e2aa45..f98e9e57 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -863,7 +863,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if (!_nm_utils_string_in_list (priv->key_mgmt, valid_key_mgmt)) { + if (!g_strv_contains (valid_key_mgmt, priv->key_mgmt)) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -936,7 +936,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if (priv->auth_alg && !_nm_utils_string_in_list (priv->auth_alg, valid_auth_algs)) { + if (priv->auth_alg && !g_strv_contains (valid_auth_algs, priv->auth_alg)) { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -958,7 +958,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) const char *wpa_none[] = { "wpa-none", NULL }; /* For ad-hoc connections, pairwise must be "none" */ - if (_nm_utils_string_in_list (priv->key_mgmt, wpa_none)) { + if (g_strv_contains (wpa_none, priv->key_mgmt)) { GSList *iter; gboolean found = FALSE; |