vapi: Update GIR-based bindings

diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 4531a74fc59adf6dcffc5d6d41db59479a4d1536..440a0dce11870d37c39bd166174aeec583388c12 100644 (file)
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -5791,7 +5791,7 @@ namespace Clutter {
                public static unowned Clutter.BindingPool get_for_class (void* klass);
                public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
                public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
-               public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
+               public void override_action (uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
                public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
                public void remove_action (uint key_val, Clutter.ModifierType modifiers);
                public void unblock_action (string action_name);

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 8a327d6dffcc62070fbedc4211edda22c20bbe55..78b77b43610ca7407a4a5f147bbdf92ed950f497 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -517,11 +517,10 @@ namespace GLib {
                public uint buffer_size { get; set construct; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_bytes_icon_get_type ()")]
+       [Version (since = "2.38")]
        public class BytesIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
                [CCode (has_construct_function = false, type = "GIcon*")]
-               [Version (since = "2.38")]
                public BytesIcon (GLib.Bytes bytes);
-               [Version (since = "2.38")]
                public unowned GLib.Bytes get_bytes ();
                public GLib.Bytes bytes { get; construct; }
        }
@@ -1229,6 +1228,7 @@ namespace GLib {
                public GLib.File container { construct; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_file_io_stream_get_type ()")]
+       [Version (since = "2.22")]
        public class FileIOStream : GLib.IOStream, GLib.Seekable {
                [CCode (has_construct_function = false)]
                protected FileIOStream ();
@@ -1236,11 +1236,8 @@ namespace GLib {
                public virtual bool can_seek ();
                [NoWrapper]
                public virtual bool can_truncate ();
-               [Version (since = "2.22")]
                public virtual string get_etag ();
-               [Version (since = "2.22")]
                public virtual GLib.FileInfo query_info (string attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               [Version (since = "2.22")]
                public virtual async GLib.FileInfo query_info_async (string attributes, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [NoWrapper]
                public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -1494,25 +1491,18 @@ namespace GLib {
                public void send_to_mainloop_async (owned GLib.SourceFunc func);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_io_stream_get_type ()")]
+       [Version (since = "2.22")]
        public abstract class IOStream : GLib.Object {
                [CCode (has_construct_function = false)]
                protected IOStream ();
-               [Version (since = "2.22")]
                public void clear_pending ();
                [CCode (vfunc_name = "close_fn")]
-               [Version (since = "2.22")]
                public virtual bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
-               [Version (since = "2.22")]
                public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
-               [Version (since = "2.22")]
                public virtual unowned GLib.InputStream get_input_stream ();
-               [Version (since = "2.22")]
                public virtual unowned GLib.OutputStream get_output_stream ();
-               [Version (since = "2.22")]
                public bool has_pending ();
-               [Version (since = "2.22")]
                public bool is_closed ();
-               [Version (since = "2.22")]
                public bool set_pending () throws GLib.Error;
                [CCode (finish_instance = false)]
                [Version (since = "2.28")]
@@ -2445,15 +2435,12 @@ namespace GLib {
                public SimplePermission (bool allowed);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_simple_proxy_resolver_get_type ()")]
+       [Version (since = "2.36")]
        public class SimpleProxyResolver : GLib.Object, GLib.ProxyResolver {
                [CCode (has_construct_function = false, type = "GProxyResolver*")]
-               [Version (since = "2.36")]
                public SimpleProxyResolver (string? default_proxy, string? ignore_hosts);
-               [Version (since = "2.36")]
                public void set_default_proxy (string default_proxy);
-               [Version (since = "2.36")]
                public void set_ignore_hosts (string ignore_hosts);
-               [Version (since = "2.36")]
                public void set_uri_proxy (string uri_scheme, string proxy);
                [NoAccessorMethod]
                public string default_proxy { owned get; set; }
@@ -2668,20 +2655,16 @@ namespace GLib {
                public GLib.Socket socket { get; construct; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_socket_control_message_get_type ()")]
+       [Version (since = "2.22")]
        public abstract class SocketControlMessage : GLib.Object {
                [CCode (has_construct_function = false)]
                protected SocketControlMessage ();
-               [Version (since = "2.22")]
                public static GLib.SocketControlMessage deserialize (int level, int type, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] data);
-               [Version (since = "2.22")]
                public virtual int get_level ();
-               [Version (since = "2.22")]
                public int get_msg_type ();
-               [Version (since = "2.22")]
                public virtual size_t get_size ();
                [NoWrapper]
                public virtual int get_type ();
-               [Version (since = "2.22")]
                public virtual void serialize ([CCode (array_length = false, type = "gpointer")] uint8[] data);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_socket_listener_get_type ()")]
@@ -2889,9 +2872,9 @@ namespace GLib {
                public bool graceful_disconnect { get; set; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_tcp_wrapper_connection_get_type ()")]
+       [Version (since = "2.28")]
        public class TcpWrapperConnection : GLib.TcpConnection {
                [CCode (has_construct_function = false, type = "GSocketConnection*")]
-               [Version (since = "2.28")]
                public TcpWrapperConnection (GLib.IOStream base_io_stream, GLib.Socket socket);
                public unowned GLib.IOStream get_base_io_stream ();
                public GLib.IOStream base_io_stream { get; construct; }
@@ -3253,14 +3236,11 @@ namespace GLib {
                public virtual signal void action_state_changed (string action_name, GLib.Variant state);
        }
        [CCode (cheader_filename = "gio/gio.h", type_cname = "GActionMapInterface", type_id = "g_action_map_get_type ()")]
+       [Version (since = "2.32")]
        public interface ActionMap : GLib.Object {
-               [Version (since = "2.32")]
                public abstract void add_action (GLib.Action action);
-               [Version (since = "2.32")]
                public void add_action_entries ([CCode (array_length_cname = "n_entries", array_length_pos = 1.5)] GLib.ActionEntry[] entries, void* user_data);
-               [Version (since = "2.32")]
                public abstract unowned GLib.Action lookup_action (string action_name);
-               [Version (since = "2.32")]
                public abstract void remove_action (string action_name);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_app_info_get_type ()")]
@@ -3800,10 +3780,9 @@ namespace GLib {
                public abstract async string[] lookup_async (string uri, GLib.Cancellable? cancellable = null) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h", type_cname = "GRemoteActionGroupInterface", type_id = "g_remote_action_group_get_type ()")]
+       [Version (since = "2.32")]
        public interface RemoteActionGroup : GLib.ActionGroup, GLib.Object {
-               [Version (since = "2.32")]
                public abstract void activate_action_full (string action_name, GLib.Variant? parameter, GLib.Variant platform_data);
-               [Version (since = "2.32")]
                public abstract void change_action_state_full (string action_name, GLib.Variant value, GLib.Variant platform_data);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_seekable_get_type ()")]

diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index 7a700f1301652fbcfd4f001dea116f3c145b6727..a363a8e2d43233e0cae64fc0f0ec2d6a810b7723 100644 (file)
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -192,6 +192,8 @@ namespace GI {
                [CCode (array_length = false, array_null_terminated = true)]
                public string[] get_loaded_namespaces ();
                public int get_n_infos (string namespace_);
+               [Version (since = "1.60")]
+               public void get_object_gtype_interfaces (GLib.Type gtype, [CCode (array_length_cname = "n_interfaces_out", array_length_pos = 1.5, array_length_type = "guint")] out unowned GI.InterfaceInfo[] interfaces_out);
                public static GLib.OptionGroup get_option_group ();
                public static unowned GLib.SList<string> get_search_path ();
                public unowned string get_shared_library (string namespace_);

diff --git a/vapi/libgeoclue-2.0.vapi b/vapi/libgeoclue-2.0.vapi
index cd6af91270625a387bbe34b2d2a673c22f9bb543..fe0413e8eea72cf7234f8dc0010525b0d5a37602 100644 (file)
--- a/vapi/libgeoclue-2.0.vapi
+++ b/vapi/libgeoclue-2.0.vapi
@@ -131,10 +131,6 @@ namespace GClue {
                public void complete_create_client (owned GLib.DBusMethodInvocation invocation, string client);
                public void complete_delete_client (owned GLib.DBusMethodInvocation invocation);
                public void complete_get_client (owned GLib.DBusMethodInvocation invocation, string client);
-               [NoWrapper]
-               public abstract bool handle_create_client (GLib.DBusMethodInvocation invocation);
-               [NoWrapper]
-               public abstract bool handle_delete_client (GLib.DBusMethodInvocation invocation, string arg_client);
                public static unowned GLib.DBusInterfaceInfo interface_info ();
                public static uint override_properties (GLib.ObjectClass klass, uint property_id_begin);
                [NoAccessorMethod]
@@ -142,6 +138,8 @@ namespace GClue {
                [NoAccessorMethod]
                public abstract bool in_use { get; set; }
                public virtual signal bool handle_add_agent (GLib.DBusMethodInvocation invocation, string arg_id);
+               public virtual signal bool handle_create_client (GLib.DBusMethodInvocation invocation);
+               public virtual signal bool handle_delete_client (GLib.DBusMethodInvocation invocation, string arg_client);
                public virtual signal bool handle_get_client (GLib.DBusMethodInvocation invocation);
        }
        [CCode (cheader_filename = "geoclue.h", cprefix = "GCLUE_ACCURACY_LEVEL_", type_id = "gclue_accuracy_level_get_type ()")]