From: Rico Tzschichholz Date: Tue, 18 Apr 2017 14:38:04 +0000 (+0200) Subject: gio-2.0: Fix GLib.Task constructor X-Git-Tag: 0.37.1~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee7aa700d56818e9fe4d8396a97d44ce17815f72;p=thirdparty%2Fvala.git gio-2.0: Fix GLib.Task constructor https://bugzilla.gnome.org/show_bug.cgi?id=781449 --- diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index d1f3610af..b1efe495a 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -2735,7 +2735,7 @@ namespace GLib { public class Task : GLib.Object, GLib.AsyncResult { [CCode (has_construct_function = false)] [Version (since = "2.36")] - public async Task (GLib.Object? source_object, GLib.Cancellable? cancellable = null); + public Task (GLib.Object? source_object, GLib.Cancellable? cancellable, [CCode (scope = "async")] GLib.TaskReadyCallback callback); [Version (since = "2.36")] public void attach_source (GLib.Source source, [CCode (type = "GSourceFunc")] GLib.TaskSourceFunc callback); [Version (since = "2.36")] @@ -4709,6 +4709,8 @@ namespace GLib { [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)] [Version (since = "2.22")] public delegate bool SocketSourceFunc (GLib.Socket socket, GLib.IOCondition condition); + [CCode (cheader_filename = "gio/gio.h", cname = "GAsyncReadyCallback", instance_pos = 2.9)] + public delegate void TaskReadyCallback (GLib.Object? source_object, GLib.Task task); [CCode (cheader_filename = "gio/gio.h", cname = "GSourceFunc", has_target = false)] public delegate bool TaskSourceFunc (GLib.Task task); [CCode (cheader_filename = "gio/gio.h", has_target = false)] diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index fb0565b78..b7233f35d 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -137,6 +137,12 @@ namespace GLib { public static GLib.SocketConnection factory_create_connection (GLib.Socket socket); } + public class Task : GLib.Object { + [CCode (has_construct_function = false)] + [Version (since = "2.36")] + public Task (GLib.Object? source_object, GLib.Cancellable? cancellable, [CCode (scope = "async")] GLib.TaskReadyCallback callback); + } + public class TlsPassword : GLib.Object { [CCode (vfunc_name = "set_value")] public virtual void set_value_full ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gssize", type = "guchar*")] owned uint8[] value, GLib.DestroyNotify? notify = GLib.g_free); @@ -185,6 +191,8 @@ namespace GLib { public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter); [Version (deprecated_since = "vala-0.26", replacement = "SimplActionChangeStateFunc")] 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); [CCode (has_target = false, cname = "GSourceFunc")] public delegate bool TaskSourceFunc (Task task); [CCode (cheader_filename = "gio/gio.h", instance_pos = 6.9)] diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index 6d4137add..063d71bb5 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -229,6 +229,7 @@ Subprocess Task .attach_source skip=false .attach_source.callback type="TaskSourceFunc" + .new skip .run_in_thread* skip=false .report_new_error skip=false printf_format .return_new_error skip=false printf_format