From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 18 Apr 2017 15:09:04 +0000 (+0200)
Subject: gio-2.0: Fix GLib.Task.report_error/report_new_error()
X-Git-Tag: 0.37.1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=370b41001904718e9142b39f81ecf5d317d7a4c9;p=thirdparty%2Fvala.git

gio-2.0: Fix GLib.Task.report_error/report_new_error()
---

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