vala r1155 - in trunk: . vapi vapi/packages/json-glib-1.0

[juergbi svn gnome org]

Author: juergbi
Date: Sun Mar 23 10:26:29 2008
New Revision: 1155
URL: http://svn.gnome.org/viewvc/vala?rev=1155&view=rev

Log:
2008-03-23  Juerg Billeter  <j bitron ch>

	* vapi/packages/json-glib-1.0/: add metadata to fix some memory
	  leaks and out parameters, fixes bug 523889

	* vapi/json-glib-1.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/json-glib-1.0.vapi
   trunk/vapi/packages/json-glib-1.0/json-glib-1.0.metadata

Modified: trunk/vapi/json-glib-1.0.vapi
==============================================================================
--- trunk/vapi/json-glib-1.0.vapi	(original)
+++ trunk/vapi/json-glib-1.0.vapi	Sun Mar 23 10:26:29 2008
@@ -2,19 +2,19 @@
 
 [CCode (cprefix = "Json", lower_case_cprefix = "json_")]
 namespace Json {
-	[CCode (cprefix = "JSON_NODE_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cprefix = "JSON_NODE_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
 	public enum NodeType {
 		OBJECT,
 		ARRAY,
 		VALUE,
 		NULL,
 	}
-	[CCode (cprefix = "JSON_PARSER_ERROR_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cprefix = "JSON_PARSER_ERROR_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
 	public enum ParserError {
 		PARSE,
 		UNKNOWN,
 	}
-	[CCode (cprefix = "JSON_TOKEN_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cprefix = "JSON_TOKEN_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
 	public enum TokenType {
 		INVALID,
 		TRUE,
@@ -78,7 +78,7 @@
 	public class Generator : GLib.Object {
 		public Generator ();
 		public void set_root (Json.Node node);
-		public weak string to_data (ulong length);
+		public string to_data (out ulong length);
 		public bool to_file (string filename) throws GLib.Error;
 		[NoAccessorMethod]
 		public weak uint indent { get; set; }
@@ -93,7 +93,7 @@
 		public uint get_current_line ();
 		public uint get_current_pos ();
 		public weak Json.Node get_root ();
-		public bool has_assignment (string variable_name);
+		public bool has_assignment (out weak string variable_name);
 		public bool load_from_data (string data, ulong length) throws GLib.Error;
 		public bool load_from_file (string filename) throws GLib.Error;
 		public Parser ();
@@ -110,13 +110,15 @@
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public interface Serializable {
 		public abstract bool deserialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
-		public abstract weak Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
+		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 	}
 	public const int MAJOR_VERSION;
 	public const int MICRO_VERSION;
 	public const int MINOR_VERSION;
 	public const int VERSION_HEX;
 	public const string VERSION_S;
-	public static weak GLib.Object construct_gobject (GLib.Type gtype, string data, ulong length) throws GLib.Error;
-	public static weak string serialize_gobject (GLib.Object gobject, ulong length);
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static GLib.Object construct_gobject (GLib.Type gtype, string data, ulong length) throws GLib.Error;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public static string serialize_gobject (GLib.Object gobject, out ulong length);
 }

Modified: trunk/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
==============================================================================
--- trunk/vapi/packages/json-glib-1.0/json-glib-1.0.metadata	(original)
+++ trunk/vapi/packages/json-glib-1.0/json-glib-1.0.metadata	Sun Mar 23 10:26:29 2008
@@ -1 +1,9 @@
 Json cheader_filename="json-glib/json-glib.h"
+json_generator_to_data transfer_ownership="1"
+json_generator_to_data.length is_out="1"
+json_parser_has_assignment.variable_name is_out="1"
+json_serializable_serialize_property transfer_ownership="1"
+json_construct_gobject transfer_ownership="1"
+json_serialize_gobject transfer_ownership="1"
+json_serialize_gobject.length is_out="1"
+