diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /libnm-core/nm-setting-user.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'libnm-core/nm-setting-user.c')
| -rw-r--r-- | libnm-core/nm-setting-user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c index 87a0dfed..1c60d55b 100644 --- a/libnm-core/nm-setting-user.c +++ b/libnm-core/nm-setting-user.c @@ -327,7 +327,7 @@ out: /* setting a value purges all invalid values that were set * via GObject property. */ changed = TRUE; - g_clear_pointer (&priv->data_invalid, g_hash_table_unref); + nm_clear_pointer (&priv->data_invalid, g_hash_table_unref); } if (changed) _notify (self, PROP_DATA); @@ -462,8 +462,8 @@ set_property (GObject *object, guint prop_id, data = g_value_get_boxed (value); if (!data || !g_hash_table_size (data)) { - g_clear_pointer (&priv->data, g_hash_table_unref); - g_clear_pointer (&priv->data_invalid, g_hash_table_unref); + nm_clear_pointer (&priv->data, g_hash_table_unref); + nm_clear_pointer (&priv->data_invalid, g_hash_table_unref); return; } @@ -488,7 +488,7 @@ set_property (GObject *object, guint prop_id, } if ( priv->data_invalid && !g_hash_table_size (priv->data_invalid)) - g_clear_pointer (&priv->data_invalid, g_hash_table_unref); + nm_clear_pointer (&priv->data_invalid, g_hash_table_unref); break; default: |