summaryrefslogtreecommitdiff
path: root/libnm-util/nm-setting-8021x.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-05-29 17:11:44 -0300
committerDan Winship <danw@gnome.org>2013-05-29 17:13:30 -0300
commit43617d4c1d3445ff61f68f094a0bc788dff4a0c7 (patch)
tree921f7ef4731c55290d4a94678ec2bc8b6753f981 /libnm-util/nm-setting-8021x.c
parentc7c86558325a3975e5420661e68ea691de18164a (diff)
downloadNetworkManager-43617d4c1d3445ff61f68f094a0bc788dff4a0c7.tar.gz
libnm-util: deprecate nm_utils_slist_free(), use g_slist_free_full()
Diffstat (limited to 'libnm-util/nm-setting-8021x.c')
-rw-r--r--libnm-util/nm-setting-8021x.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index c357a3576b..c118ff425a 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -290,7 +290,7 @@ nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting)
g_return_if_fail (NM_IS_SETTING_802_1X (setting));
priv = NM_SETTING_802_1X_GET_PRIVATE (setting);
- nm_utils_slist_free (priv->eap, g_free);
+ g_slist_free_full (priv->eap, g_free);
priv->eap = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_EAP);
}
@@ -695,7 +695,7 @@ nm_setting_802_1x_clear_altsubject_matches (NMSetting8021x *setting)
g_return_if_fail (NM_IS_SETTING_802_1X (setting));
priv = NM_SETTING_802_1X_GET_PRIVATE (setting);
- nm_utils_slist_free (priv->altsubject_matches, g_free);
+ g_slist_free_full (priv->altsubject_matches, g_free);
priv->altsubject_matches = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_ALTSUBJECT_MATCHES);
}
@@ -1242,7 +1242,7 @@ nm_setting_802_1x_clear_phase2_altsubject_matches (NMSetting8021x *setting)
g_return_if_fail (NM_IS_SETTING_802_1X (setting));
priv = NM_SETTING_802_1X_GET_PRIVATE (setting);
- nm_utils_slist_free (priv->phase2_altsubject_matches, g_free);
+ g_slist_free_full (priv->phase2_altsubject_matches, g_free);
priv->phase2_altsubject_matches = NULL;
g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES);
}
@@ -2665,9 +2665,9 @@ finalize (GObject *object)
g_byte_array_free (priv->password_raw, TRUE);
g_free (priv->pin);
- nm_utils_slist_free (priv->eap, g_free);
- nm_utils_slist_free (priv->altsubject_matches, g_free);
- nm_utils_slist_free (priv->phase2_altsubject_matches, g_free);
+ g_slist_free_full (priv->eap, g_free);
+ g_slist_free_full (priv->altsubject_matches, g_free);
+ g_slist_free_full (priv->phase2_altsubject_matches, g_free);
if (priv->ca_cert)
g_byte_array_free (priv->ca_cert, TRUE);
@@ -2715,7 +2715,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) {
case PROP_EAP:
- nm_utils_slist_free (priv->eap, g_free);
+ g_slist_free_full (priv->eap, g_free);
priv->eap = g_value_dup_boxed (value);
break;
case PROP_IDENTITY:
@@ -2751,7 +2751,7 @@ set_property (GObject *object, guint prop_id,
priv->subject_match = g_value_dup_string (value);
break;
case PROP_ALTSUBJECT_MATCHES:
- nm_utils_slist_free (priv->altsubject_matches, g_free);
+ g_slist_free_full (priv->altsubject_matches, g_free);
priv->altsubject_matches = g_value_dup_boxed (value);
break;
case PROP_CLIENT_CERT:
@@ -2807,7 +2807,7 @@ set_property (GObject *object, guint prop_id,
priv->phase2_subject_match = g_value_dup_string (value);
break;
case PROP_PHASE2_ALTSUBJECT_MATCHES:
- nm_utils_slist_free (priv->phase2_altsubject_matches, g_free);
+ g_slist_free_full (priv->phase2_altsubject_matches, g_free);
priv->phase2_altsubject_matches = g_value_dup_boxed (value);
break;
case PROP_PHASE2_CLIENT_CERT: