From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 2 Jan 2018 12:07:58 +0000 (+0100)
Subject: vapi: Update GIR-based bindings
X-Git-Tag: 0.39.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b10169c0e3c0d6d41bca168ed4d395feac32d5c1;p=thirdparty%2Fvala.git

vapi: Update GIR-based bindings
---

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index f6e21ffdc..f1b66e024 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -3216,7 +3216,7 @@ namespace Gtk {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		[Version (since = "2.4")]
 		public FontButton ();
-		[Version (since = "2.4")]
+		[Version (deprecated = true, deprecated_since = "3.22", since = "2.4")]
 		public unowned string get_font_name ();
 		[Version (since = "2.4")]
 		public bool get_show_size ();
@@ -3228,7 +3228,7 @@ namespace Gtk {
 		public bool get_use_font ();
 		[Version (since = "2.4")]
 		public bool get_use_size ();
-		[Version (since = "2.4")]
+		[Version (deprecated = true, deprecated_since = "3.22", since = "2.4")]
 		public bool set_font_name (string fontname);
 		[Version (since = "2.4")]
 		public void set_show_size (bool show_size);
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 38e1d6da9..1a47cee82 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -195,10 +195,16 @@ namespace Json {
 		public unowned Json.Array get_array_member (string member_name);
 		[Version (since = "0.8")]
 		public bool get_boolean_member (string member_name);
+		[Version (since = "1.6")]
+		public bool get_boolean_member_with_default (string member_name, bool default_value);
 		[Version (since = "0.8")]
 		public double get_double_member (string member_name);
+		[Version (since = "1.6")]
+		public double get_double_member_with_default (string member_name, double default_value);
 		[Version (since = "0.8")]
 		public int64 get_int_member (string member_name);
+		[Version (since = "1.6")]
+		public int64 get_int_member_with_default (string member_name, int64 default_value);
 		public unowned Json.Node? get_member (string member_name);
 		public GLib.List<weak string>? get_members ();
 		[Version (since = "0.8")]
@@ -208,6 +214,8 @@ namespace Json {
 		public uint get_size ();
 		[Version (since = "0.8")]
 		public unowned string get_string_member (string member_name);
+		[Version (since = "1.6")]
+		public unowned string get_string_member_with_default (string member_name, string default_value);
 		public GLib.List<weak Json.Node>? get_values ();
 		public bool has_member (string member_name);
 		[Version (since = "1.2")]
@@ -255,7 +263,7 @@ namespace Json {
 		[Version (since = "0.12")]
 		public async bool load_from_stream_async (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[Version (since = "1.4")]
-		public Json.Node steal_root ();
+		public Json.Node? steal_root ();
 		[NoAccessorMethod]
 		[Version (since = "1.2")]
 		public bool immutable { get; construct; }