diff options
author | Thomas Haller <thaller@redhat.com> | 2016-08-11 19:17:26 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-08-11 19:21:55 +0200 |
commit | 6d2680acf1a27c98b6108f1f0ff7286250c7684c (patch) | |
tree | 509850546025848bb8d008863eb16435027ad421 /shared | |
parent | a657fc39ce33ce805db8dca73507cb478186cea3 (diff) | |
download | NetworkManager-6d2680acf1a27c98b6108f1f0ff7286250c7684c.tar.gz |
nm-glib.h: fix compatibility wrapper for g_variant_new_take_string()
g_variant_new_from_bytes() is itself only available since 2.36, thus
using it triggers a deprecation warning itself.
Diffstat (limited to 'shared')
-rw-r--r-- | shared/nm-utils/nm-glib.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index b0ad4572dd..824a08ca0d 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -420,7 +420,16 @@ _nm_g_strv_contains (const gchar * const *strv, static inline GVariant * _nm_g_variant_new_take_string (gchar *string) { -#if !GLIB_CHECK_VERSION(2, 38, 0) +#if !GLIB_CHECK_VERSION(2, 36, 0) + GVariant *value; + + g_return_val_if_fail (string != NULL, NULL); + g_return_val_if_fail (g_utf8_validate (string, -1, NULL), NULL); + + value = g_variant_new_string (string); + g_free (string); + return value; +#elif !GLIB_CHECK_VERSION(2, 38, 0) GVariant *value; GBytes *bytes; |