gio-2.0: Add some missing NoWrapper and CCode.has_typedef attributes

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 12daf3f56e9b7766e46014f4ad5ab05d6866d359..e6efd78d3fc6dca9ebebdec119fad7ee3841ca53 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3436,14 +3436,19 @@ namespace GLib {
                public bool condition_wait (GLib.IOCondition condition, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
                public GLib.Source create_source (GLib.IOCondition condition, GLib.Cancellable? cancellable = null);
                [CCode (vfunc_name = "condition_check")]
+               [NoWrapper]
                public virtual GLib.IOCondition datagram_condition_check (GLib.IOCondition condition);
                [CCode (vfunc_name = "condition_wait")]
+               [NoWrapper]
                public virtual bool datagram_condition_wait (GLib.IOCondition condition, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "create_source")]
+               [NoWrapper]
                public virtual GLib.Source datagram_create_source (GLib.IOCondition condition, GLib.Cancellable? cancellable = null);
                [CCode (vfunc_name = "receive_messages")]
+               [NoWrapper]
                public virtual int datagram_receive_messages ([CCode (array_length_cname = "num_messages", array_length_pos = 1.5, array_length_type = "guint")] GLib.InputMessage[] messages, int flags, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "send_messages")]
+               [NoWrapper]
                public virtual int datagram_send_messages ([CCode (array_length_cname = "num_messages", array_length_pos = 1.5, array_length_type = "guint")] GLib.OutputMessage[] messages, int flags, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
                public int receive_messages ([CCode (array_length_cname = "num_messages", array_length_pos = 1.5, array_length_type = "guint")] GLib.InputMessage[] messages, int flags, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
                public int send_messages ([CCode (array_length_cname = "num_messages", array_length_pos = 1.5, array_length_type = "guint")] GLib.OutputMessage[] messages, int flags, int64 timeout, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -3830,6 +3835,7 @@ namespace GLib {
                public abstract bool is_readable ();
                public ssize_t read_nonblocking ([CCode (array_length_cname = "count", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "read_nonblocking")]
+               [NoWrapper]
                public abstract ssize_t read_nonblocking_fn ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] buffer) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h", type_cname = "GPollableOutputStreamInterface", type_id = "g_pollable_output_stream_get_type ()")]
@@ -3840,10 +3846,12 @@ namespace GLib {
                public abstract bool is_writable ();
                public ssize_t write_nonblocking ([CCode (array_length_cname = "count", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "write_nonblocking")]
+               [NoWrapper]
                public abstract ssize_t write_nonblocking_fn ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[]? buffer) throws GLib.Error;
                [Version (since = "2.60")]
                public GLib.PollableReturn writev_nonblocking ([CCode (array_length_cname = "n_vectors", array_length_pos = 1.5, array_length_type = "gsize")] GLib.OutputVector[] vectors, out size_t bytes_written, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "writev_nonblocking")]
+               [NoWrapper]
                [Version (since = "2.60")]
                public abstract GLib.PollableReturn writev_nonblocking_fn ([CCode (array_length_cname = "n_vectors", array_length_pos = 1.5, array_length_type = "gsize")] GLib.OutputVector[] vectors, out size_t bytes_written) throws GLib.Error;
        }
@@ -4929,9 +4937,9 @@ namespace GLib {
        public delegate GLib.Variant SettingsBindSetMappingShared (GLib.Value value, GLib.VariantType expected_type, void* user_data);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
        public delegate bool SettingsGetMapping (GLib.Variant value, out void* result);
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", has_typedef = false)]
        public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter);
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", has_typedef = false)]
        public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]
        public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable? cancellable = null);

diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 9bb88ae926e4da9f96a78c73576d621bbea00972..1b212271a59692fef86211427efb384ac60db84d 100644 (file)
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -177,7 +177,9 @@ namespace GLib {
                }
        }
 
+       [CCode (has_typedef = false)]
        public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter);
+       [CCode (has_typedef = false)]
        public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value);
        [CCode (cheader_filename = "gio/gio.h", cname = "GAsyncReadyCallback", instance_pos = 2.9)]
        public delegate void TaskReadyCallback (GLib.Object? source_object, GLib.Task task);

diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index b4bdd692d5694b7f12d477a1c81e0304ff46307d..9d181fa3a0ff0519f3f14dcda0bc1a32094b583d 100644 (file)
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -84,11 +84,11 @@ Cancellable
 Credentials
   .get_native skip=false
 DatagramBased
-  .condition_check#virtual_method virtual name="datagram_condition_check"
-  .condition_wait#virtual_method virtual name="datagram_condition_wait"
-  .create_source#virtual_method virtual name="datagram_create_source"
-  .receive_messages#virtual_method virtual name="datagram_receive_messages"
-  .send_messages#virtual_method virtual name="datagram_send_messages"
+  .condition_check#virtual_method virtual name="datagram_condition_check" no_wrapper
+  .condition_wait#virtual_method virtual name="datagram_condition_wait" no_wrapper
+  .create_source#virtual_method virtual name="datagram_create_source" no_wrapper
+  .receive_messages#virtual_method virtual name="datagram_receive_messages" no_wrapper
+  .send_messages#virtual_method virtual name="datagram_send_messages" no_wrapper
 DataInputStream
   .read_* throws="GLib.IOError"
   .read_line_finish_utf8 skip
@@ -283,11 +283,11 @@ Initable
 PollableInputStream
   .create_source type="GLib.PollableSource"
   .read_nonblocking.buffer type="uint8[]" array_length_idx=1
-  .read_nonblocking#virtual_method name="read_nonblocking_fn"
+  .read_nonblocking#virtual_method name="read_nonblocking_fn" no_wrapper
 PollableOutputStream
   .create_source type="GLib.PollableSource"
-  .write_nonblocking#virtual_method name="write_nonblocking_fn"
-  .writev_nonblocking#virtual_method name="writev_nonblocking_fn"
+  .write_nonblocking#virtual_method name="write_nonblocking_fn" no_wrapper
+  .writev_nonblocking#virtual_method name="writev_nonblocking_fn" no_wrapper
 TlsClientConnection
   .new nullable
   .accepted_cas type="GLib.List<GLib.ByteArray>"