diff options
| author | Dan Winship <danw@gnome.org> | 2013-10-07 13:57:52 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-10-24 12:25:08 -0400 |
| commit | f4c3e2f6438995ea6881aed5e957635256de862e (patch) | |
| tree | 8801dd26aaa08fce74400947a694eb9fd9ab57fa /libnm-util/nm-setting-wireless-security.c | |
| parent | 83c5a69126fe2363bab5c06881d34562b1674bcf (diff) | |
| download | NetworkManager-f4c3e2f6438995ea6881aed5e957635256de862e.tar.gz | |
libnm-util: centralize find_setting_by_name code
Several settings types' verify() functions need to find a particular
setting from the all_settings list that NMConnection passes them. Add
a convenience function for this.
Diffstat (limited to 'libnm-util/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-util/nm-setting-wireless-security.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 4c8cb1b2d5..2c6984b464 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -777,15 +777,6 @@ no_secrets: return NULL; } -static gint -find_setting_by_name (gconstpointer a, gconstpointer b) -{ - NMSetting *setting = NM_SETTING (a); - const char *str = (const char *) b; - - return strcmp (nm_setting_get_name (setting), str); -} - static gboolean verify (NMSetting *setting, GSList *all_settings, GError **error) { @@ -847,7 +838,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 (!g_slist_find_custom (all_settings, NM_SETTING_802_1X_SETTING_NAME, find_setting_by_name)) { + if (!nm_setting_find_in_list (all_settings, NM_SETTING_802_1X_SETTING_NAME)) { g_set_error (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, |