]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
json-glib-1.0: Mark return-type of gvariant_deserialize*() as nullable
authorDavid Hewitt <davidmhewitt@gmail.com>
Sat, 14 Apr 2018 18:18:22 +0000 (19:18 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Mon, 16 Apr 2018 19:19:02 +0000 (21:19 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=795265

vapi/json-glib-1.0.vapi
vapi/metadata/Json-1.0.metadata

index 7ac4dc2a55968fff5bde898ae599b00a179f2f61..8ad1d437c264495cb14f8ce33ddc8a5fd420c4d4 100644 (file)
@@ -425,10 +425,10 @@ namespace Json {
        public static string gobject_to_data (GLib.Object gobject, out size_t length);
        [CCode (cheader_filename = "json-glib/json-glib.h", returns_floating_reference = true)]
        [Version (since = "0.14")]
-       public static GLib.Variant gvariant_deserialize (Json.Node json_node, string? signature) throws GLib.Error;
+       public static GLib.Variant? gvariant_deserialize (Json.Node json_node, string? signature) throws GLib.Error;
        [CCode (cheader_filename = "json-glib/json-glib.h", returns_floating_reference = true)]
        [Version (since = "0.14")]
-       public static GLib.Variant gvariant_deserialize_data (string json, ssize_t length, string? signature) throws GLib.Error;
+       public static GLib.Variant? gvariant_deserialize_data (string json, ssize_t length, string? signature) throws GLib.Error;
        [CCode (cheader_filename = "json-glib/json-glib.h")]
        [Version (since = "0.14")]
        public static Json.Node gvariant_serialize (GLib.Variant variant);
index 19941168043aa466546138f3c19d402d050b8466..79df8a07e3f14cc15227e04c550bae1aeccc0f3c 100644 (file)
@@ -21,8 +21,8 @@ boxed_register_serialize_func skip=false
 boxed_register_deserialize_func skip=false
 
 // Floating references
-gvariant_deserialize unowned=false floating
-gvariant_deserialize_data unowned=false floating
+gvariant_deserialize unowned=false nullable floating
+gvariant_deserialize_data unowned=false nullable floating
 
 Object.add_member replacement="Json.Object.set_member"
 Serializable cheader_filename="json-glib/json-glib.h,json-glib/json-gobject.h"