diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-01-04 18:27:42 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-07 10:09:10 +0100 |
| commit | 1f906d92147af4dfdccb189c101c6d98ddd04a03 (patch) | |
| tree | 931e1fff444f78e8a6a32c1bb29f54a5538014bd | |
| parent | 22dc82724cba5c2922b3f6663a8a78605cbc3e3c (diff) | |
| download | NetworkManager-1f906d92147af4dfdccb189c101c6d98ddd04a03.tar.gz | |
shared/glib: add compat implementation for g_value_unset() to allow unintialized GValue
| -rw-r--r-- | shared/nm-utils/nm-glib.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index 770cf0fe39..b7534edd2a 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -538,4 +538,28 @@ _nm_g_variant_new_printf (const char *format_string, ...) /*****************************************************************************/ +#if !GLIB_CHECK_VERSION (2, 47, 1) +/* Older versions of g_value_unset() only allowed to unset a GValue which + * was initialized previously. This was relaxed ([1], [2], [3]). + * + * Our nm_auto_unset_gvalue macro requires to be able to call g_value_unset(). + * Also, it is our general practice to allow for that. Add a compat implementation. + * + * [1] https://gitlab.gnome.org/GNOME/glib/commit/4b2d92a864f1505f1b08eb639d74293fa32681da + * [2] commit "Allow passing unset GValues to g_value_unset()" + * [3] https://bugzilla.gnome.org/show_bug.cgi?id=755766 + */ +static inline void +_nm_g_value_unset (GValue *value) +{ + g_return_if_fail (value); + + if (value->g_type != 0) + g_value_unset (value); +} +#define g_value_unset _nm_g_value_unset +#endif + +/*****************************************************************************/ + #endif /* __NM_GLIB_H__ */ |