diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-03-26 08:35:51 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-03-26 08:35:51 -0400 |
| commit | 95410d8dcdd0433894612785c89b821b9de4cc04 (patch) | |
| tree | 66c57586825b10af593a84a00ee885aa257b5196 /libnm/nm-object.c | |
| parent | 6b60d03d200147c516db40716b1c58e2a86db1a5 (diff) | |
| parent | aee9265c9325331914e9fd42ce06e063fabdfcab (diff) | |
Merge tag 'debian/1.10.6-2' into bionic
network-manager Debian release 1.10.6-2
Diffstat (limited to 'libnm/nm-object.c')
| -rw-r--r-- | libnm/nm-object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c index c5316880..82e519e6 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -1131,6 +1131,8 @@ init_async (GAsyncInitable *initable, int io_priority, init_data = g_slice_new0 (NMObjectInitData); init_data->object = self; init_data->simple = g_simple_async_result_new (G_OBJECT (initable), callback, user_data, init_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (init_data->simple, cancellable); init_data->cancellable = cancellable ? g_object_ref (cancellable) : NULL; interfaces = g_dbus_object_get_interfaces (priv->object); |