From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 3 Dec 2014 07:10:24 +0000 (-0500)
Subject: GVariant: clean up g_variant_get_child_value()
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7c1a2238f9335de05dceab15414ee4403226463;p=platform%2Fupstream%2Fglib.git

GVariant: clean up g_variant_get_child_value()

Remove this one outstanding case of direct construction of GVariant
instances and port it to use g_variant_alloc() like everyone else.
---

diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index 0117add..32b1a88 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -1012,15 +1012,10 @@ g_variant_get_child_value (GVariant *value,
       s_child = g_variant_serialised_get_child (serialised, index_);
 
       /* create a new serialised instance out of it */
-      child = g_slice_new (GVariant);
-      child->type_info = s_child.type_info;
-      child->state = (value->state & STATE_TRUSTED) |
-                     STATE_SERIALISED;
-      child->size = s_child.size;
-      child->ref_count = 1;
-      child->contents.serialised.bytes =
-        g_bytes_ref (value->contents.serialised.bytes);
-      child->contents.serialised.data = s_child.data;
+      child = g_variant_new_serialised (s_child.type_info,
+                                        g_bytes_ref (value->contents.serialised.bytes),
+                                        s_child.data, s_child.size,
+                                        value->state & STATE_TRUSTED);
     }
 
   return child;