From: Evan Nemerson <evan@coeus-group.com>
Date: Sun, 14 Mar 2010 05:25:30 +0000 (-0800)
Subject: json-glib-1.0: Use metadata instead of json-glib-1.0-custom.vala
X-Git-Tag: 0.8.0~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20db7f59c9ae1d9ea157adacb91e73666e53f69b;p=thirdparty%2Fvala.git

json-glib-1.0: Use metadata instead of json-glib-1.0-custom.vala
---

diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index bc9d852f5..5bedfaa9b 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Json", lower_case_cprefix = "json_")]
 namespace Json {
 	[Compact]
-	[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", type_id = "JSON_TYPE_ARRAY", cheader_filename = "json-glib/json-glib.h")]
 	public class Array {
 		[CCode (has_construct_function = false)]
 		public Array ();
@@ -79,7 +79,7 @@ namespace Json {
 		public unowned string type_name ();
 	}
 	[Compact]
-	[CCode (ref_function = "json_object_ref", unref_function = "json_object_unref", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (ref_function = "json_object_ref", unref_function = "json_object_unref", type_id = "JSON_TYPE_OBJECT", cheader_filename = "json-glib/json-glib.h")]
 	public class Object {
 		[CCode (has_construct_function = false)]
 		public Object ();
diff --git a/vapi/packages/json-glib-1.0/json-glib-1.0-custom.vala b/vapi/packages/json-glib-1.0/json-glib-1.0-custom.vala
deleted file mode 100644
index 42b996154..000000000
--- a/vapi/packages/json-glib-1.0/json-glib-1.0-custom.vala
+++ /dev/null
@@ -1,31 +0,0 @@
-/* json-glib-1.0.vala
- *
- * Copyright (C) 2008  Evan Nemerson
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- */
-
-namespace Json {
-	[Compact]
-	public class Object {
-		public GLib.List<weak string> get_members ();
-		public GLib.List<weak Node> get_values ();
-	}
-
-	[Compact]
-	public class Array {
-		public GLib.List<weak Node> get_elements ();
-	}
-}
diff --git a/vapi/packages/json-glib-1.0/json-glib-1.0.metadata b/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
index ac5145154..5feb0d762 100644
--- a/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
+++ b/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
@@ -11,7 +11,7 @@ json_serialize_gobject.length is_out="1"
 json_array_add_array_element.value transfer_ownership="1"
 json_array_add_element.node transfer_ownership="1"
 json_array_add_object_element.value transfer_ownership="1"
-json_array_get_elements hidden="1"
+json_array_get_elements type_arguments="unowned Node" transfer_ownership="1"
 json_gobject_to_data transfer_ownership="1"
 json_gobject_to_data.length is_out="1"
 json_node_copy transfer_ownership="1"
@@ -21,8 +21,8 @@ json_node_dup_string transfer_ownership="1"
 json_node_get_value.value is_out="1"
 json_node_take_array.array transfer_ownership="1"
 json_node_take_object.object transfer_ownership="1"
-json_object_get_members hidden="1"
-json_object_get_values hidden="1"
+json_object_get_members type_arguments="unowned string" transfer_ownership="1"
+json_object_get_values type_arguments="unowned Node" transfer_ownership="1"
 json_object_add_member.node transfer_ownership="1"
 json_object_set_array_member.value transfer_ownership="1"
 json_object_set_object_member.value transfer_ownership="1"