Commit 8a2d2032 authored by Mark Lee's avatar Mark Lee Committed by Jürg Billeter

json-glib-1.0: Fix bindings

Fix JsonSerializable, json_serializable_deserialize_property,
json_construct_gobject, json_serialize_gobject, and
json_node_get_value bindings. Fixes bug 581068.
parent 261a6125
......@@ -45,7 +45,7 @@ namespace Json {
public unowned Json.Object get_object ();
public unowned Json.Node get_parent ();
public unowned string get_string ();
public void get_value (GLib.Value value);
public void get_value (out GLib.Value value);
public GLib.Type get_value_type ();
[CCode (has_construct_function = false)]
public Node (Json.NodeType type);
......@@ -94,9 +94,9 @@ namespace Json {
public virtual signal void parse_end ();
public virtual signal void parse_start ();
}
[CCode (cheader_filename = "json-glib/json-glib.h")]
[CCode (cheader_filename = "json-glib/json-gobject.h")]
public interface Serializable {
public abstract bool deserialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
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")]
......@@ -130,8 +130,8 @@ 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")]
[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")]
[CCode (cheader_filename = "json-glib/json-gobject.h")]
public static string serialize_gobject (GLib.Object gobject, out size_t length);
}
Json cheader_filename="json-glib/json-glib.h"
JsonSerializable cheader_filename="json-glib/json-gobject.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_deserialize_property.value is_out="1"
json_serializable_serialize_property transfer_ownership="1"
json_construct_gobject transfer_ownership="1"
json_serialize_gobject transfer_ownership="1"
json_construct_gobject cheader_filename="json-glib/json-gobject.h" transfer_ownership="1"
json_serialize_gobject cheader_filename="json-glib/json-gobject.h" transfer_ownership="1"
json_serialize_gobject.length is_out="1"
json_array_add_element.node transfer_ownership="1"
json_array_get_elements hidden="1"
......@@ -12,6 +14,7 @@ json_node_copy transfer_ownership="1"
json_node_dup_array transfer_ownership="1"
json_node_dup_object transfer_ownership="1"
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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment