From 48079c2f580171235eecc298b0193022a67e0b79 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 29 Jan 2008 18:18:01 +0000 Subject: Update after the JsonParser::get_root change Do not free the root node returned by the get_root() method in the JSON-GObject API and in the JsonParser tests. --- json-glib/json-gobject.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'json-glib/json-gobject.c') diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c index 0526283..b0a0e13 100644 --- a/json-glib/json-gobject.c +++ b/json-glib/json-gobject.c @@ -581,7 +581,7 @@ json_construct_gobject (GType gtype, } root = json_parser_get_root (parser); - if (JSON_NODE_TYPE (root) != JSON_NODE_OBJECT) + if (root == NULL || JSON_NODE_TYPE (root) != JSON_NODE_OBJECT) { g_set_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_PARSE, @@ -652,8 +652,6 @@ json_construct_gobject (GType gtype, g_list_free (members); - json_node_free (root); - g_object_thaw_notify (retval); g_type_class_unref (klass); -- cgit v1.2.1