summary refs log tree commit diff
path: root/libnm-glib/nm-object.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-03-13 01:29:54 +0100
committerMichael Biebl <biebl@debian.org>2018-03-13 01:29:54 +0100
commit7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (patch)
treee48e88b177182607488bcfd2d2645dbc77276866 /libnm-glib/nm-object.c
parent50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff)
New upstream version 1.10.6 upstream/1.10.6
Diffstat (limited to 'libnm-glib/nm-object.c')
-rw-r--r--libnm-glib/nm-object.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 2e07ff6d..d3f8c830 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -303,6 +303,8 @@ init_async (GAsyncInitable *initable, int io_priority,
 	GSimpleAsyncResult *simple;
 
 	simple = g_simple_async_result_new (G_OBJECT (initable), callback, user_data, init_async);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 
 	/* Check if NM is running */
 	dbus_g_proxy_begin_call (priv->bus_proxy, "NameHasOwner",