From 326be41d1291f30f8acd949a774b600ebcb3e3cf Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 18 Aug 2013 07:51:25 -0400 Subject: [PATCH] Revert "libotutil: Make use of GBytes in ot_variant_read()" This reverts commit c77908bf514d61e75798932f61b5b414d9e36a3c; we can't do this since g_variant_get_data_as_bytes() is a GLib 2.36 API. --- src/libotutil/ot-variant-utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c index 7b034a42..417975f6 100644 --- a/src/libotutil/ot-variant-utils.c +++ b/src/libotutil/ot-variant-utils.c @@ -190,12 +190,12 @@ GInputStream * ot_variant_read (GVariant *variant) { GMemoryInputStream *ret = NULL; - gs_unref_bytes GBytes *bytes = NULL; - - bytes = g_variant_get_data_as_bytes (variant); - ret = (GMemoryInputStream*)g_memory_input_stream_new (); - g_memory_input_stream_add_bytes (ret, bytes); + ret = (GMemoryInputStream*)g_memory_input_stream_new_from_data (g_variant_get_data (variant), + g_variant_get_size (variant), + NULL); + g_object_set_data_full ((GObject*)ret, "ot-variant-data", + g_variant_ref (variant), (GDestroyNotify) g_variant_unref); return (GInputStream*)ret; }