From e84c765c5401ee4103d94bd48067cd2c94364f29 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Sat, 14 Apr 2018 19:18:22 +0100 Subject: [PATCH] json-glib-1.0: Mark return-type of gvariant_deserialize*() as nullable https://bugzilla.gnome.org/show_bug.cgi?id=795265 --- vapi/json-glib-1.0.vapi | 4 ++-- vapi/metadata/Json-1.0.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi index 1a47cee82..45d23e27d 100644 --- a/vapi/json-glib-1.0.vapi +++ b/vapi/json-glib-1.0.vapi @@ -437,10 +437,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" -- 2.11.4.GIT