summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-04-18 17:09:04 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2017-04-18 17:09:04 +0200
commit370b41001904718e9142b39f81ecf5d317d7a4c9 (patch)
tree0b65c39edfa917a63720220b339c27779bb4348d
parentee7aa700d56818e9fe4d8396a97d44ce17815f72 (diff)
downloadvala-370b41001904718e9142b39f81ecf5d317d7a4c9.tar.gz
gio-2.0: Fix GLib.Task.report_error/report_new_error()
-rw-r--r--vapi/gio-2.0.vapi4
-rw-r--r--vapi/metadata/Gio-2.0-custom.vala5
-rw-r--r--vapi/metadata/Gio-2.0.metadata3
3 files changed, 9 insertions, 3 deletions
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index b1efe495a..fc4db4474 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2765,10 +2765,10 @@ namespace GLib {
[Version (since = "2.36")]
public void* propagate_pointer () throws GLib.Error;
[Version (since = "2.36")]
- public static async void report_error (GLib.Object? source_object, void* source_tag, owned GLib.Error error);
+ public static void report_error (GLib.Object? source_object, [CCode (scope = "async")] GLib.AsyncReadyCallback callback, void* source_tag, owned GLib.Error error);
[PrintfFormat]
[Version (since = "2.36")]
- public static async void report_new_error (GLib.Object? source_object, void* source_tag, GLib.Quark domain, int code, string format, ...);
+ public static void report_new_error (GLib.Object? source_object, [CCode (scope = "async")] GLib.AsyncReadyCallback callback, void* source_tag, GLib.Quark domain, int code, string format, ...);
[Version (since = "2.36")]
public void return_boolean (bool result);
[Version (since = "2.36")]
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index b7233f35d..85fb01df3 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -141,6 +141,11 @@ namespace GLib {
[CCode (has_construct_function = false)]
[Version (since = "2.36")]
public Task (GLib.Object? source_object, GLib.Cancellable? cancellable, [CCode (scope = "async")] GLib.TaskReadyCallback callback);
+ [Version (since = "2.36")]
+ public static void report_error (GLib.Object? source_object, [CCode (scope = "async")] GLib.AsyncReadyCallback callback, void* source_tag, owned GLib.Error error);
+ [PrintfFormat]
+ [Version (since = "2.36")]
+ public static void report_new_error (GLib.Object? source_object, [CCode (scope = "async")] GLib.AsyncReadyCallback callback, void* source_tag, GLib.Quark domain, int code, string format, ...);
}
public class TlsPassword : GLib.Object {
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 063d71bb5..3217b2714 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -231,7 +231,8 @@ Task
.attach_source.callback type="TaskSourceFunc"
.new skip
.run_in_thread* skip=false
- .report_new_error skip=false printf_format
+ .report_error skip
+ .report_new_error skip
.return_new_error skip=false printf_format
TlsDatabase
.create_certificate_handle nullable