From: David Zeuthen <davidz@redhat.com>
Date: Sat, 15 May 2010 01:08:01 +0000 (-0400)
Subject: GDBus: Use specific variant type in GetAll()
X-Git-Tag: 2.25.5~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=763c1dab1f2c92526330425d77211b704668a3a3;p=platform%2Fupstream%2Fglib.git

GDBus: Use specific variant type in GetAll()

Without this fix, we segfault if the exported object returned an error
on all get_property() calls (in reality, this never happens).

Signed-off-by: David Zeuthen <davidz@redhat.com>
---

diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 3c0051aac..913c409d9 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -3393,7 +3393,7 @@ invoke_get_all_properties_in_idle_cb (gpointer _data)
    *       We could fail the whole call if just a single get_property() call
    *       returns an error. We need clarification in the D-Bus spec about this.
    */
-  builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
   for (n = 0; data->interface_info->properties != NULL && data->interface_info->properties[n] != NULL; n++)
     {
       const GDBusPropertyInfo *property_info = data->interface_info->properties[n];