vapi: Update GIR-based bindings

9 files changed, 37 insertions, 10 deletions

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 9863c3d02..81850f8ea 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -794,6 +794,8 @@ namespace Atk {
 		FOOTNOTE,
 		CONTENT_DELETION,
 		CONTENT_INSERTION,
+		MARK,
+		SUGGESTION,
 		LAST_DEFINED;
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.Role for_name (string name);
@@ -899,6 +901,7 @@ namespace Atk {
 		STRETCH,
 		VARIANT,
 		STYLE,
+		TEXT_POSITION,
 		LAST_DEFINED;
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.TextAttribute for_name (string name);
diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index 957249fd7..e169c2c54 100644
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -701,6 +701,8 @@ namespace Atspi {
 		FOOTNOTE,
 		CONTENT_DELETION,
 		CONTENT_INSERTION,
+		MARK,
+		SUGGESTION,
 		LAST_DEFINED;
 		public string get_name ();
 	}
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index bd291afbf..257a8ab1b 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3502,6 +3502,7 @@ namespace GLib {
 		public abstract unowned string? get_negotiated_protocol ();
 		public unowned GLib.TlsCertificate get_peer_certificate ();
 		public GLib.TlsCertificateFlags get_peer_certificate_errors ();
+		[Version (deprecated = true, deprecated_since = "2.64.", since = "2.48")]
 		public GLib.TlsRehandshakeMode get_rehandshake_mode ();
 		public bool get_require_close_notify ();
 		public abstract bool handshake (GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -3535,7 +3536,7 @@ namespace GLib {
 		[ConcreteAccessor]
 		public abstract GLib.TlsCertificateFlags peer_certificate_errors { get; }
 		[ConcreteAccessor]
-		[Version (deprecated = true, deprecated_since = "2.60.", since = "2.48")]
+		[Version (deprecated = true, deprecated_since = "2.60", since = "2.48")]
 		public abstract GLib.TlsRehandshakeMode rehandshake_mode { get; set construct; }
 		[ConcreteAccessor]
 		public abstract bool require_close_notify { get; set construct; }
diff --git a/vapi/gnome-desktop-3.0.vapi b/vapi/gnome-desktop-3.0.vapi
index 0e489bc47..12450b055 100644
--- a/vapi/gnome-desktop-3.0.vapi
+++ b/vapi/gnome-desktop-3.0.vapi
@@ -48,13 +48,14 @@ namespace Gnome {
 		public BG ();
 		public bool changes_with_time ();
 		public Gdk.Pixbuf create_frame_thumbnail (Gnome.DesktopThumbnailFactory factory, Gdk.Screen screen, int dest_width, int dest_height, int frame_num);
-		public Cairo.Surface create_surface (Gdk.Window window, int width, int height, bool root);
+		public Cairo.Surface create_surface (Gdk.Window window, int width, int height);
 		public Gdk.Pixbuf create_thumbnail (Gnome.DesktopThumbnailFactory factory, Gdk.Screen screen, int dest_width, int dest_height);
-		public void draw (Gdk.Pixbuf dest, Gdk.Screen screen, bool is_root);
+		public void draw (Gdk.Pixbuf dest);
 		public unowned string get_filename ();
 		public bool get_image_size (Gnome.DesktopThumbnailFactory factory, int best_width, int best_height, int width, int height);
 		public GDesktop.BackgroundStyle get_placement ();
 		public void get_rgba (GDesktop.BackgroundShading type, Gdk.RGBA primary, Gdk.RGBA secondary);
+		[Version (deprecated = true, deprecated_since = "3.36")]
 		public static Cairo.Surface get_surface_from_root (Gdk.Screen screen);
 		public bool has_multiple_sizes ();
 		public bool is_dark (int dest_width, int dest_height);
@@ -63,7 +64,9 @@ namespace Gnome {
 		public void set_filename (string filename);
 		public void set_placement (GDesktop.BackgroundStyle placement);
 		public void set_rgba (GDesktop.BackgroundShading type, Gdk.RGBA primary, Gdk.RGBA secondary);
+		[Version (deprecated = true, deprecated_since = "3.36")]
 		public static void set_surface_as_root (Gdk.Screen screen, Cairo.Surface surface);
+		[Version (deprecated = true, deprecated_since = "3.36")]
 		public static Gnome.BGCrossfade set_surface_as_root_with_crossfade (Gdk.Screen screen, Cairo.Surface surface);
 		public signal void changed ();
 		public signal void transitioned ();
@@ -130,10 +133,12 @@ namespace Gnome {
 		public uint add_idle_watch (uint64 interval_msec, owned Gnome.IdleMonitorWatchFunc? callback);
 		public uint add_user_active_watch (owned Gnome.IdleMonitorWatchFunc? callback);
 		[CCode (has_construct_function = false)]
+		[Version (deprecated = true, deprecated_since = "3.36")]
 		public IdleMonitor.for_device (Gdk.Device device) throws GLib.Error;
 		public uint64 get_idletime ();
 		public void remove_watch (uint id);
 		[NoAccessorMethod]
+		[Version (deprecated = true, deprecated_since = "3.36")]
 		public Gdk.Device device { owned get; construct; }
 	}
 	[CCode (cheader_filename = "libgnome-desktop/gnome-pnp-ids.h", type_id = "gnome_pnp_ids_get_type ()")]
diff --git a/vapi/graphene-gobject-1.0.vapi b/vapi/graphene-gobject-1.0.vapi
index 42855f794..1a9926a49 100644
--- a/vapi/graphene-gobject-1.0.vapi
+++ b/vapi/graphene-gobject-1.0.vapi
@@ -684,8 +684,4 @@ namespace Graphene {
 	[CCode (cheader_filename = "graphene-gobject.h", cname = "GRAPHENE_VEC4_LEN")]
 	[Version (since = "1.0")]
 	public const int VEC4_LEN;
-	[CCode (cheader_filename = "graphene-gobject.h", cname = "false")]
-	public const int @false;
-	[CCode (cheader_filename = "graphene-gobject.h", cname = "true")]
-	public const int @true;
 }
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 4a06d2a06..b9025b514 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -321,7 +321,7 @@ namespace Json {
 		[Version (since = "0.10")]
 		public bool default_deserialize_property (string property_name, out GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		[Version (since = "0.10")]
-		public Json.Node default_serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
+		public Json.Node? default_serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 		public virtual bool deserialize_property (string property_name, out GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		[Version (since = "0.14")]
 		public virtual unowned GLib.ParamSpec? find_property (string name);
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 36b741e1e..1f18cfcf4 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -489,7 +489,7 @@ namespace Soup {
 		public bool is_past ();
 		public string to_string (Soup.DateFormat format);
 		public time_t to_time_t ();
-		[Version (since = "2.24")]
+		[Version (deprecated = true, since = "2.24")]
 		public GLib.TimeVal to_timeval ();
 	}
 	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_hsts_enforcer_get_type ()")]
diff --git a/vapi/metadata/GnomeDesktop-3.0-custom.vala b/vapi/metadata/GnomeDesktop-3.0-custom.vala
index d06a5d2d4..7b1861bfa 100644
--- a/vapi/metadata/GnomeDesktop-3.0-custom.vala
+++ b/vapi/metadata/GnomeDesktop-3.0-custom.vala
@@ -1,4 +1,16 @@
 namespace Gnome {
+	[CCode (cheader_filename = "libgnome-desktop/gnome-bg.h", type_id = "gnome_bg_get_type ()")]
+	public class BG : GLib.Object {
+		//FIXME public Cairo.Surface create_surface (Gdk.Window window, int width, int height, bool root);
+		//FIXME public void draw (Gdk.Pixbuf dest, Gdk.Screen screen, bool is_root);
+		[Version (deprecated = true, deprecated_since = "3.36")]
+		public static Cairo.Surface get_surface_from_root (Gdk.Screen screen);
+		[Version (deprecated = true, deprecated_since = "3.36")]
+		public static void set_surface_as_root (Gdk.Screen screen, Cairo.Surface surface);
+		[Version (deprecated = true, deprecated_since = "3.36")]
+		public static Gnome.BGCrossfade set_surface_as_root_with_crossfade (Gdk.Screen screen, Cairo.Surface surface);
+	}
+
 	[CCode (cheader_filename = "libgnome-desktop/gnome-bg-slide-show.h", type_id = "gnome_bg_slide_show_get_type ()")]
 	public class BGSlideShow : GLib.Object {
 		public void load_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
@@ -7,4 +19,13 @@ namespace Gnome {
 		[Version (deprecated = true, deprecated_since = "3.34")]
 		public string filename { owned get; construct; }
 	}
+	[CCode (cheader_filename = "libgnome-desktop/gnome-idle-monitor.h", type_id = "gnome_idle_monitor_get_type ()")]
+	public class IdleMonitor : GLib.Object {
+		[CCode (has_construct_function = false)]
+		[Version (deprecated = true, deprecated_since = "3.36")]
+		public IdleMonitor.for_device (Gdk.Device device) throws GLib.Error;
+		[NoAccessorMethod]
+		[Version (deprecated = true, deprecated_since = "3.36")]
+		public Gdk.Device device { owned get; construct; }
+	}
 }
diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index b115e326d..77356e60d 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -415,7 +415,6 @@ NumerableIcon
   .new_with_style_context symbol_type="constructor"
 TreeModel
   .filter_new parent="Gtk.TreeModelFilter" name="new" symbol_type="constructor"
-  .sort_new_with_model parent="Gtk.TreeModelSort" name="new_with_model" symbol_type="constructor"
 
 // These aren't actually used publicly anywhere.
 TableChild skip