D-Bus: Support Cancellable parameter in GDBus clients

2 files changed, 26 insertions, 0 deletions

diff --git a/tests/dbus/async-errors.test b/tests/dbus/async-errors.test
index c3c669f54..4c9483f5d 100644
--- a/tests/dbus/async-errors.test
+++ b/tests/dbus/async-errors.test
@@ -8,6 +8,7 @@ interface Test : Object {
 	public abstract async void test_void () throws Error;
 	public abstract async int test_int (int i, out int j) throws Error;
 	public abstract async string test_string (string s, out string t) throws Error;
+	public abstract async void test_cancellable (Cancellable? cancellable = null) throws Error;
 }
 
 MainLoop main_loop;
@@ -35,6 +36,14 @@ async void run () {
 	} catch {
 	}
 
+	try {
+		var cancellable = new Cancellable ();
+		cancellable.cancel ();
+		yield test.test_cancellable (cancellable);
+		assert_not_reached ();
+	} catch {
+	}
+
 	main_loop.quit ();
 }
 
@@ -67,6 +76,11 @@ class Test : Object {
 		yield;
 		throw new IOError.FAILED ("Operation failed");
 	}
+
+	public async void test_cancellable (Cancellable? cancellable = null) throws Error {
+		Idle.add (test_cancellable.callback);
+		yield;
+	}
 }
 
 MainLoop main_loop;
diff --git a/tests/dbus/errors.test b/tests/dbus/errors.test
index 826aeb371..9088fb4fd 100644
--- a/tests/dbus/errors.test
+++ b/tests/dbus/errors.test
@@ -8,6 +8,7 @@ interface Test : Object {
 	public abstract void test_void () throws Error;
 	public abstract int test_int (int i, out int j) throws Error;
 	public abstract string test_string (string s, out string t) throws Error;
+	public abstract void test_cancellable (Cancellable? cancellable = null) throws Error;
 }
 
 void main () {
@@ -35,6 +36,14 @@ void main () {
 		assert_not_reached ();
 	} catch {
 	}
+
+	try {
+		var cancellable = new Cancellable ();
+		cancellable.cancel ();
+		test.test_cancellable (cancellable);
+		assert_not_reached ();
+	} catch {
+	}
 }
 
 Program: server
@@ -52,6 +61,9 @@ class Test : Object {
 	public string test_string (string s, out string t) throws Error {
 		throw new IOError.FAILED ("Operation failed");
 	}
+
+	public void test_cancellable (Cancellable? cancellable = null) throws Error {
+	}
 }
 
 MainLoop main_loop;