From: David Hewitt <davidmhewitt@gmail.com>
Date: Sat, 14 Apr 2018 18:18:22 +0000 (+0100)
Subject: json-glib-1.0: Mark return-type of gvariant_deserialize*() as nullable
X-Git-Tag: 0.34.18~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a75ed61eea23a24f9c812871ed154f245fffe88f;p=thirdparty%2Fvala.git

json-glib-1.0: Mark return-type of gvariant_deserialize*() as nullable

https://bugzilla.gnome.org/show_bug.cgi?id=795265
---

diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 7ac4dc2a5..8ad1d437c 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -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);
diff --git a/vapi/metadata/Json-1.0.metadata b/vapi/metadata/Json-1.0.metadata
index 199411680..79df8a07e 100644
--- a/vapi/metadata/Json-1.0.metadata
+++ b/vapi/metadata/Json-1.0.metadata
@@ -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"