json-glib-1.0: always include json-glib.h

Fixes bug 605924.

diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 4d9cd55870c002da53a1e6617cf57a0d15c83f36..bc9d852f5ce6dee80a6d09b9a214837c4d90a51e 100644 (file)
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -129,7 +129,7 @@ namespace Json {
                public virtual signal void parse_end ();
                public virtual signal void parse_start ();
        }
-       [CCode (cheader_filename = "json-glib/json-gobject.h")]
+       [CCode (cheader_filename = "json-glib/json-glib.h,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);
@@ -178,7 +178,7 @@ namespace Json {
        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")]
+       [CCode (cheader_filename = "json-glib/json-glib.h,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);
@@ -188,6 +188,6 @@ namespace Json {
        public static unowned Json.Node gobject_serialize (GLib.Object gobject);
        [CCode (cheader_filename = "json-glib/json-glib.h")]
        public static string gobject_to_data (GLib.Object gobject, out size_t length);
-       [CCode (cheader_filename = "json-glib/json-gobject.h")]
+       [CCode (cheader_filename = "json-glib/json-glib.h,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.metadata b/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
index fc327b10dfe2d18a3b6cea613c30f11a2516133e..ac5145154c4208d2d0fb29b892230bba9c8a3dc9 100644 (file)
--- a/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
+++ b/vapi/packages/json-glib-1.0/json-glib-1.0.metadata
@@ -1,12 +1,12 @@
-Json cheader_filename="json-glib/json-glib.h"
-JsonSerializable cheader_filename="json-glib/json-gobject.h"
+Json* cheader_filename="json-glib/json-glib.h"
+JsonSerializable cheader_filename="json-glib/json-glib.h,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 cheader_filename="json-glib/json-gobject.h" transfer_ownership="1"
-json_serialize_gobject cheader_filename="json-glib/json-gobject.h" transfer_ownership="1"
+json_construct_gobject cheader_filename="json-glib/json-glib.h,json-glib/json-gobject.h" transfer_ownership="1"
+json_serialize_gobject cheader_filename="json-glib/json-glib.h,json-glib/json-gobject.h" transfer_ownership="1"
 json_serialize_gobject.length is_out="1"
 json_array_add_array_element.value transfer_ownership="1"
 json_array_add_element.node transfer_ownership="1"