diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /libnm-core/nm-setting-user.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
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: |