diff options
| author | Michael Biebl <biebl@debian.org> | 2018-03-13 01:30:38 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-03-13 01:30:38 +0100 |
| commit | bd71023d735a1dd11b1da3779850df573f134ad1 (patch) | |
| tree | e53ddb1bdc1f700b61377ec8a264cfce40515488 /libnm/nm-object.c | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
| parent | 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (diff) | |
Update upstream source from tag 'upstream/1.10.6'
Update to upstream version '1.10.6' with Debian dir c37b318f40a9e6c07a543a8093e311df21e75045
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); |