From: Jürg Billeter <j@bitron.ch>
Date: Sun, 10 Jan 2010 10:10:49 +0000 (+0100)
Subject: json-glib-1.0: Update to 0.10.0
X-Git-Tag: 0.7.10~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69c28b70bb38d236b5680dc077a5ac0102eb9057;p=thirdparty%2Fvala.git

json-glib-1.0: Update to 0.10.0
---

diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 47b35dee7..d1db9beaf 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -7,10 +7,26 @@ namespace Json {
 	public class Array {
 		[CCode (has_construct_function = false)]
 		public Array ();
+		public void add_array_element (Json.Array value);
+		public void add_boolean_element (bool value);
+		public void add_double_element (double value);
 		public void add_element (owned Json.Node node);
+		public void add_int_element (int64 value);
+		public void add_null_element ();
+		public void add_object_element (Json.Object value);
+		public void add_string_element (string value);
+		public unowned Json.Node dup_element (uint index_);
+		public void foreach_element (Json.ArrayForeach func, void* data);
+		public unowned Json.Array get_array_element (uint index_);
+		public bool get_boolean_element (uint index_);
+		public double get_double_element (uint index_);
 		public unowned Json.Node get_element (uint index_);
 		public GLib.List<weak Json.Node> get_elements ();
+		public int64 get_int_element (uint index_);
 		public uint get_length ();
+		public bool get_null_element (uint index_);
+		public unowned Json.Object get_object_element (uint index_);
+		public unowned string get_string_element (uint index_);
 		public void remove_element (uint index_);
 		public static unowned Json.Array sized_new (uint n_elements);
 	}
@@ -24,6 +40,8 @@ namespace Json {
 		[NoAccessorMethod]
 		public uint indent { get; set; }
 		[NoAccessorMethod]
+		public uint indent_char { get; set; }
+		[NoAccessorMethod]
 		public bool pretty { get; set; }
 		[NoAccessorMethod]
 		public Json.Node root { owned get; set; }
@@ -31,9 +49,6 @@ namespace Json {
 	[Compact]
 	[CCode (copy_function = "json_node_copy", type_id = "JSON_TYPE_NODE", cheader_filename = "json-glib/json-glib.h")]
 	public class Node {
-		public void* data;
-		public weak Json.Node parent;
-		public Json.NodeType type;
 		[CCode (has_construct_function = false)]
 		public Node (Json.NodeType type);
 		public Json.Node copy ();
@@ -43,17 +58,20 @@ namespace Json {
 		public unowned Json.Array get_array ();
 		public bool get_boolean ();
 		public double get_double ();
-		public int get_int ();
+		public int64 get_int ();
+		public Json.NodeType get_node_type ();
 		public unowned Json.Object get_object ();
 		public unowned Json.Node get_parent ();
 		public unowned string get_string ();
 		public void get_value (out GLib.Value value);
 		public GLib.Type get_value_type ();
+		public bool is_null ();
 		public void set_array (Json.Array array);
 		public void set_boolean (bool value);
 		public void set_double (double value);
-		public void set_int (int value);
+		public void set_int (int64 value);
 		public void set_object (Json.Object object);
+		public void set_parent (Json.Node parent);
 		public void set_string (string value);
 		public void set_value (GLib.Value value);
 		public void take_array (owned Json.Array array);
@@ -66,12 +84,29 @@ namespace Json {
 		[CCode (has_construct_function = false)]
 		public Object ();
 		public void add_member (string member_name, owned Json.Node node);
+		public unowned Json.Node dup_member (string member_name);
+		public void foreach_member (Json.ObjectForeach func, void* data);
+		public unowned Json.Array get_array_member (string member_name);
+		public bool get_boolean_member (string member_name);
+		public double get_double_member (string member_name);
+		public int64 get_int_member (string member_name);
 		public unowned Json.Node get_member (string member_name);
 		public GLib.List<weak string> get_members ();
+		public bool get_null_member (string member_name);
+		public unowned Json.Object get_object_member (string member_name);
 		public uint get_size ();
+		public unowned string get_string_member (string member_name);
 		public GLib.List<weak Json.Node> get_values ();
 		public bool has_member (string member_name);
 		public void remove_member (string member_name);
+		public void set_array_member (string member_name, Json.Array value);
+		public void set_boolean_member (string member_name, bool value);
+		public void set_double_member (string member_name, double value);
+		public void set_int_member (string member_name, int64 value);
+		public void set_member (string member_name, Json.Node node);
+		public void set_null_member (string member_name);
+		public void set_object_member (string member_name, Json.Object value);
+		public void set_string_member (string member_name, string value);
 	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public class Parser : GLib.Object {
@@ -82,7 +117,7 @@ namespace Json {
 		public uint get_current_pos ();
 		public unowned Json.Node get_root ();
 		public bool has_assignment (out unowned string variable_name);
-		public bool load_from_data (string data, size_t length) throws GLib.Error;
+		public bool load_from_data (string data, ssize_t length) throws GLib.Error;
 		public bool load_from_file (string filename) throws GLib.Error;
 		public virtual signal void array_element (Json.Array array, int index_);
 		public virtual signal void array_end (Json.Array array);
@@ -96,30 +131,31 @@ namespace Json {
 	}
 	[CCode (cheader_filename = "json-glib/json-gobject.h")]
 	public interface Serializable {
+		public bool default_deserialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
+		public unowned Json.Node default_serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract bool deserialize_property (string property_name, out GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 	}
-	[CCode (cprefix = "JSON_NODE_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cprefix = "JSON_NODE_", cheader_filename = "json-glib/json-glib.h")]
 	public enum NodeType {
 		OBJECT,
 		ARRAY,
 		VALUE,
 		NULL
 	}
-	[CCode (cprefix = "JSON_PARSER_ERROR_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cprefix = "JSON_PARSER_ERROR_", cheader_filename = "json-glib/json-glib.h")]
 	public enum ParserError {
 		PARSE,
 		UNKNOWN
 	}
-	[CCode (cprefix = "JSON_TOKEN_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
-	public enum TokenType {
-		INVALID,
-		TRUE,
-		FALSE,
-		NULL,
-		VAR,
-		LAST
-	}
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public delegate void ArrayForeach (Json.Array array, uint index_, Json.Node element_node);
+	[CCode (cheader_filename = "json-glib/json-glib.h", has_target = false)]
+	public delegate void* BoxedDeserializeFunc (Json.Node node);
+	[CCode (cheader_filename = "json-glib/json-glib.h", has_target = false)]
+	public delegate unowned Json.Node BoxedSerializeFunc (void* boxed);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public delegate void ObjectForeach (Json.Object object, string member_name, Json.Node member_node);
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int MAJOR_VERSION;
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
@@ -130,8 +166,28 @@ namespace Json {
 	public const int VERSION_HEX;
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const string VERSION_S;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static bool boxed_can_deserialize (GLib.Type gboxed_type, Json.NodeType node_type);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static bool boxed_can_serialize (GLib.Type gboxed_type, Json.NodeType node_type);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static void* boxed_deserialize (GLib.Type gboxed_type, Json.Node node);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static void boxed_register_deserialize_func (GLib.Type gboxed_type, Json.NodeType node_type, Json.BoxedDeserializeFunc deserialize_func);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static void boxed_register_serialize_func (GLib.Type gboxed_type, Json.NodeType node_type, Json.BoxedSerializeFunc serialize_func);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static unowned Json.Node boxed_serialize (GLib.Type gboxed_type, void* boxed);
 	[CCode (cheader_filename = "json-glib/json-gobject.h")]
 	public static GLib.Object construct_gobject (GLib.Type gtype, string data, size_t length) throws GLib.Error;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static unowned GLib.Object gobject_deserialize (GLib.Type gtype, Json.Node node);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static unowned GLib.Object gobject_from_data (GLib.Type gtype, string data, ssize_t length) throws GLib.Error;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static unowned Json.Node gobject_serialize (GLib.Object gobject);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static unowned string gobject_to_data (GLib.Object gobject, size_t length);
 	[CCode (cheader_filename = "json-glib/json-gobject.h")]
 	public static string serialize_gobject (GLib.Object gobject, out size_t length);
 }
diff --git a/vapi/packages/json-glib-1.0/json-glib-1.0.defines b/vapi/packages/json-glib-1.0/json-glib-1.0.defines
new file mode 100644
index 000000000..b08e68362
--- /dev/null
+++ b/vapi/packages/json-glib-1.0/json-glib-1.0.defines
@@ -0,0 +1 @@
+-DJSON_COMPILATION
diff --git a/vapi/packages/json-glib-1.0/json-glib-1.0.gi b/vapi/packages/json-glib-1.0/json-glib-1.0.gi
index 2250edb38..76e1bfeda 100644
--- a/vapi/packages/json-glib-1.0/json-glib-1.0.gi
+++ b/vapi/packages/json-glib-1.0/json-glib-1.0.gi
@@ -1,6 +1,50 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Json">
+		<function name="boxed_can_deserialize" symbol="json_boxed_can_deserialize">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="node_type" type="JsonNodeType"/>
+			</parameters>
+		</function>
+		<function name="boxed_can_serialize" symbol="json_boxed_can_serialize">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="node_type" type="JsonNodeType*"/>
+			</parameters>
+		</function>
+		<function name="boxed_deserialize" symbol="json_boxed_deserialize">
+			<return-type type="gpointer"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="node" type="JsonNode*"/>
+			</parameters>
+		</function>
+		<function name="boxed_register_deserialize_func" symbol="json_boxed_register_deserialize_func">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="node_type" type="JsonNodeType"/>
+				<parameter name="deserialize_func" type="JsonBoxedDeserializeFunc"/>
+			</parameters>
+		</function>
+		<function name="boxed_register_serialize_func" symbol="json_boxed_register_serialize_func">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="node_type" type="JsonNodeType"/>
+				<parameter name="serialize_func" type="JsonBoxedSerializeFunc"/>
+			</parameters>
+		</function>
+		<function name="boxed_serialize" symbol="json_boxed_serialize">
+			<return-type type="JsonNode*"/>
+			<parameters>
+				<parameter name="gboxed_type" type="GType"/>
+				<parameter name="boxed" type="gconstpointer"/>
+			</parameters>
+		</function>
 		<function name="construct_gobject" symbol="json_construct_gobject">
 			<return-type type="GObject*"/>
 			<parameters>
@@ -10,6 +54,35 @@
 				<parameter name="error" type="GError**"/>
 			</parameters>
 		</function>
+		<function name="gobject_deserialize" symbol="json_gobject_deserialize">
+			<return-type type="GObject*"/>
+			<parameters>
+				<parameter name="gtype" type="GType"/>
+				<parameter name="node" type="JsonNode*"/>
+			</parameters>
+		</function>
+		<function name="gobject_from_data" symbol="json_gobject_from_data">
+			<return-type type="GObject*"/>
+			<parameters>
+				<parameter name="gtype" type="GType"/>
+				<parameter name="data" type="gchar*"/>
+				<parameter name="length" type="gssize"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</function>
+		<function name="gobject_serialize" symbol="json_gobject_serialize">
+			<return-type type="JsonNode*"/>
+			<parameters>
+				<parameter name="gobject" type="GObject*"/>
+			</parameters>
+		</function>
+		<function name="gobject_to_data" symbol="json_gobject_to_data">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="gobject" type="GObject*"/>
+				<parameter name="length" type="gsize*"/>
+			</parameters>
+		</function>
 		<function name="serialize_gobject" symbol="json_serialize_gobject">
 			<return-type type="gchar*"/>
 			<parameters>
@@ -17,7 +90,58 @@
 				<parameter name="length" type="gsize*"/>
 			</parameters>
 		</function>
+		<callback name="JsonArrayForeach">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="array" type="JsonArray*"/>
+				<parameter name="index_" type="guint"/>
+				<parameter name="element_node" type="JsonNode*"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<callback name="JsonBoxedDeserializeFunc">
+			<return-type type="gpointer"/>
+			<parameters>
+				<parameter name="node" type="JsonNode*"/>
+			</parameters>
+		</callback>
+		<callback name="JsonBoxedSerializeFunc">
+			<return-type type="JsonNode*"/>
+			<parameters>
+				<parameter name="boxed" type="gconstpointer"/>
+			</parameters>
+		</callback>
+		<callback name="JsonObjectForeach">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="object" type="JsonObject*"/>
+				<parameter name="member_name" type="gchar*"/>
+				<parameter name="member_node" type="JsonNode*"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
 		<boxed name="JsonArray" type-name="JsonArray" get-type="json_array_get_type">
+			<method name="add_array_element" symbol="json_array_add_array_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="JsonArray*"/>
+				</parameters>
+			</method>
+			<method name="add_boolean_element" symbol="json_array_add_boolean_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="add_double_element" symbol="json_array_add_double_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="gdouble"/>
+				</parameters>
+			</method>
 			<method name="add_element" symbol="json_array_add_element">
 				<return-type type="void"/>
 				<parameters>
@@ -25,6 +149,69 @@
 					<parameter name="node" type="JsonNode*"/>
 				</parameters>
 			</method>
+			<method name="add_int_element" symbol="json_array_add_int_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="gint64"/>
+				</parameters>
+			</method>
+			<method name="add_null_element" symbol="json_array_add_null_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+				</parameters>
+			</method>
+			<method name="add_object_element" symbol="json_array_add_object_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="JsonObject*"/>
+				</parameters>
+			</method>
+			<method name="add_string_element" symbol="json_array_add_string_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="value" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="dup_element" symbol="json_array_dup_element">
+				<return-type type="JsonNode*"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
+			<method name="foreach_element" symbol="json_array_foreach_element">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="func" type="JsonArrayForeach"/>
+					<parameter name="data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="get_array_element" symbol="json_array_get_array_element">
+				<return-type type="JsonArray*"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_boolean_element" symbol="json_array_get_boolean_element">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_double_element" symbol="json_array_get_double_element">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
 			<method name="get_element" symbol="json_array_get_element">
 				<return-type type="JsonNode*"/>
 				<parameters>
@@ -38,12 +225,40 @@
 					<parameter name="array" type="JsonArray*"/>
 				</parameters>
 			</method>
+			<method name="get_int_element" symbol="json_array_get_int_element">
+				<return-type type="gint64"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
 			<method name="get_length" symbol="json_array_get_length">
 				<return-type type="guint"/>
 				<parameters>
 					<parameter name="array" type="JsonArray*"/>
 				</parameters>
 			</method>
+			<method name="get_null_element" symbol="json_array_get_null_element">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_object_element" symbol="json_array_get_object_element">
+				<return-type type="JsonObject*"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_string_element" symbol="json_array_get_string_element">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="array" type="JsonArray*"/>
+					<parameter name="index_" type="guint"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="json_array_new">
 				<return-type type="JsonArray*"/>
 			</constructor>
@@ -123,7 +338,13 @@
 				</parameters>
 			</method>
 			<method name="get_int" symbol="json_node_get_int">
-				<return-type type="gint"/>
+				<return-type type="gint64"/>
+				<parameters>
+					<parameter name="node" type="JsonNode*"/>
+				</parameters>
+			</method>
+			<method name="get_node_type" symbol="json_node_get_node_type">
+				<return-type type="JsonNodeType"/>
 				<parameters>
 					<parameter name="node" type="JsonNode*"/>
 				</parameters>
@@ -159,6 +380,12 @@
 					<parameter name="node" type="JsonNode*"/>
 				</parameters>
 			</method>
+			<method name="is_null" symbol="json_node_is_null">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="node" type="JsonNode*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="json_node_new">
 				<return-type type="JsonNode*"/>
 				<parameters>
@@ -190,7 +417,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="node" type="JsonNode*"/>
-					<parameter name="value" type="gint"/>
+					<parameter name="value" type="gint64"/>
 				</parameters>
 			</method>
 			<method name="set_object" symbol="json_node_set_object">
@@ -200,6 +427,13 @@
 					<parameter name="object" type="JsonObject*"/>
 				</parameters>
 			</method>
+			<method name="set_parent" symbol="json_node_set_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="node" type="JsonNode*"/>
+					<parameter name="parent" type="JsonNode*"/>
+				</parameters>
+			</method>
 			<method name="set_string" symbol="json_node_set_string">
 				<return-type type="void"/>
 				<parameters>
@@ -234,9 +468,6 @@
 					<parameter name="node" type="JsonNode*"/>
 				</parameters>
 			</method>
-			<field name="type" type="JsonNodeType"/>
-			<field name="data" type="gpointer"/>
-			<field name="parent" type="JsonNode*"/>
 		</boxed>
 		<boxed name="JsonObject" type-name="JsonObject" get-type="json_object_get_type">
 			<method name="add_member" symbol="json_object_add_member">
@@ -247,6 +478,49 @@
 					<parameter name="node" type="JsonNode*"/>
 				</parameters>
 			</method>
+			<method name="dup_member" symbol="json_object_dup_member">
+				<return-type type="JsonNode*"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="foreach_member" symbol="json_object_foreach_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="func" type="JsonObjectForeach"/>
+					<parameter name="data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="get_array_member" symbol="json_object_get_array_member">
+				<return-type type="JsonArray*"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_boolean_member" symbol="json_object_get_boolean_member">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_double_member" symbol="json_object_get_double_member">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_int_member" symbol="json_object_get_int_member">
+				<return-type type="gint64"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_member" symbol="json_object_get_member">
 				<return-type type="JsonNode*"/>
 				<parameters>
@@ -260,12 +534,33 @@
 					<parameter name="object" type="JsonObject*"/>
 				</parameters>
 			</method>
+			<method name="get_null_member" symbol="json_object_get_null_member">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="get_object_member" symbol="json_object_get_object_member">
+				<return-type type="JsonObject*"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_size" symbol="json_object_get_size">
 				<return-type type="guint"/>
 				<parameters>
 					<parameter name="object" type="JsonObject*"/>
 				</parameters>
 			</method>
+			<method name="get_string_member" symbol="json_object_get_string_member">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_values" symbol="json_object_get_values">
 				<return-type type="GList*"/>
 				<parameters>
@@ -295,6 +590,69 @@
 					<parameter name="member_name" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_array_member" symbol="json_object_set_array_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="JsonArray*"/>
+				</parameters>
+			</method>
+			<method name="set_boolean_member" symbol="json_object_set_boolean_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_double_member" symbol="json_object_set_double_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="set_int_member" symbol="json_object_set_int_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="gint64"/>
+				</parameters>
+			</method>
+			<method name="set_member" symbol="json_object_set_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="node" type="JsonNode*"/>
+				</parameters>
+			</method>
+			<method name="set_null_member" symbol="json_object_set_null_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_object_member" symbol="json_object_set_object_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="JsonObject*"/>
+				</parameters>
+			</method>
+			<method name="set_string_member" symbol="json_object_set_string_member">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="JsonObject*"/>
+					<parameter name="member_name" type="gchar*"/>
+					<parameter name="value" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="unref" symbol="json_object_unref">
 				<return-type type="void"/>
 				<parameters>
@@ -302,24 +660,16 @@
 				</parameters>
 			</method>
 		</boxed>
-		<enum name="JsonNodeType">
+		<enum name="JsonNodeType" type-name="JsonNodeType" get-type="json_node_type_get_type">
 			<member name="JSON_NODE_OBJECT" value="0"/>
 			<member name="JSON_NODE_ARRAY" value="1"/>
 			<member name="JSON_NODE_VALUE" value="2"/>
 			<member name="JSON_NODE_NULL" value="3"/>
 		</enum>
-		<enum name="JsonParserError">
+		<enum name="JsonParserError" type-name="JsonParserError" get-type="json_parser_error_get_type">
 			<member name="JSON_PARSER_ERROR_PARSE" value="0"/>
 			<member name="JSON_PARSER_ERROR_UNKNOWN" value="1"/>
 		</enum>
-		<enum name="JsonTokenType">
-			<member name="JSON_TOKEN_INVALID" value="270"/>
-			<member name="JSON_TOKEN_TRUE" value="271"/>
-			<member name="JSON_TOKEN_FALSE" value="272"/>
-			<member name="JSON_TOKEN_NULL" value="273"/>
-			<member name="JSON_TOKEN_VAR" value="274"/>
-			<member name="JSON_TOKEN_LAST" value="275"/>
-		</enum>
 		<object name="JsonGenerator" parent="GObject" type-name="JsonGenerator" get-type="json_generator_get_type">
 			<constructor name="new" symbol="json_generator_new">
 				<return-type type="JsonGenerator*"/>
@@ -347,6 +697,7 @@
 				</parameters>
 			</method>
 			<property name="indent" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="indent-char" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pretty" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="root" type="JsonNode*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
@@ -384,7 +735,7 @@
 				<parameters>
 					<parameter name="parser" type="JsonParser*"/>
 					<parameter name="data" type="gchar*"/>
-					<parameter name="length" type="gsize"/>
+					<parameter name="length" type="gssize"/>
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
@@ -462,6 +813,25 @@
 			</signal>
 		</object>
 		<interface name="JsonSerializable" type-name="JsonSerializable" get-type="json_serializable_get_type">
+			<method name="default_deserialize_property" symbol="json_serializable_default_deserialize_property">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="serializable" type="JsonSerializable*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+					<parameter name="property_node" type="JsonNode*"/>
+				</parameters>
+			</method>
+			<method name="default_serialize_property" symbol="json_serializable_default_serialize_property">
+				<return-type type="JsonNode*"/>
+				<parameters>
+					<parameter name="serializable" type="JsonSerializable*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+				</parameters>
+			</method>
 			<method name="deserialize_property" symbol="json_serializable_deserialize_property">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -503,8 +873,8 @@
 		</interface>
 		<constant name="JSON_MAJOR_VERSION" type="int" value="0"/>
 		<constant name="JSON_MICRO_VERSION" type="int" value="0"/>
-		<constant name="JSON_MINOR_VERSION" type="int" value="4"/>
+		<constant name="JSON_MINOR_VERSION" type="int" value="10"/>
 		<constant name="JSON_VERSION_HEX" type="int" value="0"/>
-		<constant name="JSON_VERSION_S" type="char*" value="0.4.0"/>
+		<constant name="JSON_VERSION_S" type="char*" value="0.10.0"/>
 	</namespace>
 </api>