diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-20 20:17:01 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-11-20 20:17:01 +0000 |
| commit | 3bc8b0ca576c3dfe45a853be94862b3da65a74bb (patch) | |
| tree | f67f9fddb5705e056696697b4310afa8cf6bcf8c /libnm-util/nm-setting-wireless-security.c | |
| parent | 9e07f22295a95538125899b3aab21d934aceb87c (diff) | |
| download | NetworkManager-3bc8b0ca576c3dfe45a853be94862b3da65a74bb.tar.gz | |
2008-11-20 Dan Williams <dcbw@redhat.com>
* libnm-util/Makefile.am
libnm-util/nm-utils-private.h
- New header for internal utils private functions
* libnm-util/libnm-util.ver
libnm-util/nm-utils.c
libnm-util/nm-utils.h
- Document some functions
- (nm_utils_string_in_list, nm_utils_string_list_contains,
nm_utils_string_slist_validate): un-export, only used within
libnm-util or of limited use in general, and very easy to
re-implement by apps if needed
* libnm-util/nm-setting-8021x.c
libnm-util/nm-setting-wired.c
libnm-util/nm-setting-wireless-security.c
libnm-util/nm-setting-wireless.c
- Update for private nm_utils_string_* functions
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4319 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-util/nm-setting-wireless-security.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 4187433f99..9f1604855c 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -31,6 +31,7 @@ #include "nm-param-spec-specialized.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" +#include "nm-utils-private.h" GQuark nm_setting_wireless_security_error_quark (void) @@ -565,7 +566,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } - if (!nm_utils_string_in_list (priv->key_mgmt, valid_key_mgmt)) { + if (!_nm_utils_string_in_list (priv->key_mgmt, valid_key_mgmt)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, @@ -648,7 +649,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } - if (priv->auth_alg && !nm_utils_string_in_list (priv->auth_alg, valid_auth_algs)) { + if (priv->auth_alg && !_nm_utils_string_in_list (priv->auth_alg, valid_auth_algs)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, @@ -656,7 +657,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } - if (priv->proto && !nm_utils_string_slist_validate (priv->proto, valid_protos)) { + if (priv->proto && !_nm_utils_string_slist_validate (priv->proto, valid_protos)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, @@ -668,7 +669,7 @@ verify (NMSetting *setting, GSList *all_settings, 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 (_nm_utils_string_in_list (priv->key_mgmt, wpa_none)) { GSList *iter; gboolean found = FALSE; @@ -689,7 +690,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_WIRELESS_SECURITY_PAIRWISE); return FALSE; } - } else if (!nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) { + } else if (!_nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, @@ -698,7 +699,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) } } - if (priv->group && !nm_utils_string_slist_validate (priv->group, valid_groups)) { + if (priv->group && !_nm_utils_string_slist_validate (priv->group, valid_groups)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, |