about summary refs log tree commit diff
path: root/libnm/nm-device.c
diff options
context:
space:
mode:
authorJeremy Bicha <jbicha@ubuntu.com>2018-03-26 08:35:51 -0400
committerJeremy Bicha <jbicha@ubuntu.com>2018-03-26 08:35:51 -0400
commit95410d8dcdd0433894612785c89b821b9de4cc04 (patch)
tree66c57586825b10af593a84a00ee885aa257b5196 /libnm/nm-device.c
parent6b60d03d200147c516db40716b1c58e2a86db1a5 (diff)
parentaee9265c9325331914e9fd42ce06e063fabdfcab (diff)
Merge tag 'debian/1.10.6-2' into bionic
network-manager Debian release 1.10.6-2
Diffstat (limited to 'libnm/nm-device.c')
-rw-r--r--libnm/nm-device.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 65afd078..ffdfca9c 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -2005,6 +2005,8 @@ nm_device_reapply_async (NMDevice *device,
 
 	simple = g_simple_async_result_new (G_OBJECT (device), callback, user_data,
 	                                    nm_device_reapply_async);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 
 	nmdbus_device_call_reapply (NM_DEVICE_GET_PRIVATE (device)->proxy,
 	                            dict, version_id, flags, cancellable,
@@ -2168,6 +2170,8 @@ nm_device_get_applied_connection_async  (NMDevice *device,
 
 	simple = g_simple_async_result_new (G_OBJECT (device), callback, user_data,
 	                                    nm_device_get_applied_connection_async);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 
 	nmdbus_device_call_get_applied_connection (NM_DEVICE_GET_PRIVATE (device)->proxy,
 	                                           flags, cancellable,
@@ -2289,6 +2293,8 @@ nm_device_disconnect_async (NMDevice *device,
 
 	simple = g_simple_async_result_new (G_OBJECT (device), callback, user_data,
 	                                    nm_device_disconnect_async);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 
 	nmdbus_device_call_disconnect (NM_DEVICE_GET_PRIVATE (device)->proxy,
 	                               cancellable,
@@ -2390,6 +2396,8 @@ nm_device_delete_async (NMDevice *device,
 
 	simple = g_simple_async_result_new (G_OBJECT (device), callback, user_data,
 	                                    nm_device_delete_async);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 
 	nmdbus_device_call_delete (NM_DEVICE_GET_PRIVATE (device)->proxy,
 	                           cancellable,