From c32ddc30c0c84570b40593f6ccd6cc5d0fbd4e7b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 29 Sep 2021 18:42:23 +0200
Subject: [PATCH] glib-aux: add nm_g_variant_singleton_{i_0,as,aay,au}()
 helpers

---
 src/libnm-glib-aux/nm-shared-utils.c | 24 ++++++++++++++++++++++++
 src/libnm-glib-aux/nm-shared-utils.h |  4 ++++
 2 files changed, 28 insertions(+)

diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index 11636520c2..45d28fa945 100644
--- a/src/libnm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -558,6 +558,12 @@ nm_g_variant_singleton_u_0(void)
     return _variant_singleton_get(g_variant_new_uint32(0));
 }
 
+GVariant *
+nm_g_variant_singleton_i_0(void)
+{
+    return _variant_singleton_get(g_variant_new_int32(0));
+}
+
 GVariant *
 nm_g_variant_singleton_b(gboolean value)
 {
@@ -601,6 +607,24 @@ _variant_singleton_get_array_init(GVariant **p_singleton, const char *variant_ty
         _v;                                                                          \
     })
 
+GVariant *
+nm_g_variant_singleton_au(void)
+{
+    return _variant_singleton_get_array("u");
+}
+
+GVariant *
+nm_g_variant_singleton_aay(void)
+{
+    return _variant_singleton_get_array("ay");
+}
+
+GVariant *
+nm_g_variant_singleton_as(void)
+{
+    return _variant_singleton_get_array("s");
+}
+
 GVariant *
 nm_g_variant_singleton_aLsvI(void)
 {
diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h
index 15d2a1835c..ebd9c5dbb8 100644
--- a/src/libnm-glib-aux/nm-shared-utils.h
+++ b/src/libnm-glib-aux/nm-shared-utils.h
@@ -1528,7 +1528,11 @@ char *nm_utils_str_utf8safe_escape_take(char *str, NMUtilsStrUtf8SafeFlags flags
 
 GVariant *nm_g_variant_singleton_b(gboolean value);
 GVariant *nm_g_variant_singleton_u_0(void);
+GVariant *nm_g_variant_singleton_i_0(void);
 GVariant *nm_g_variant_singleton_s_empty(void);
+GVariant *nm_g_variant_singleton_au(void);
+GVariant *nm_g_variant_singleton_aay(void);
+GVariant *nm_g_variant_singleton_as(void);
 GVariant *nm_g_variant_singleton_aLsvI(void);
 GVariant *nm_g_variant_singleton_aLsaLsvII(void);
 GVariant *nm_g_variant_singleton_aaLsvI(void);