diff options
| author | Michael Biebl <biebl@debian.org> | 2018-03-13 01:29:54 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-03-13 01:29:54 +0100 |
| commit | 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (patch) | |
| tree | e48e88b177182607488bcfd2d2645dbc77276866 /libnm/nm-manager.c | |
| parent | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff) | |
New upstream version 1.10.6 upstream/1.10.6
Diffstat (limited to 'libnm/nm-manager.c')
| -rw-r--r-- | libnm/nm-manager.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 54a951a6..5eeed668 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -672,6 +672,8 @@ nm_manager_check_connectivity_async (NMManager *manager, simple = g_simple_async_result_new (G_OBJECT (manager), callback, user_data, nm_manager_check_connectivity_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nmdbus_manager_call_check_connectivity (priv->proxy, cancellable, check_connectivity_cb, simple); @@ -955,6 +957,8 @@ nm_manager_activate_connection_async (NMManager *manager, info->manager = manager; info->simple = g_simple_async_result_new (G_OBJECT (manager), callback, user_data, nm_manager_activate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (info->simple, cancellable); info->cancellable = cancellable ? g_object_ref (cancellable) : NULL; c_list_link_tail (&priv->pending_activations, &info->lst); @@ -1032,6 +1036,8 @@ nm_manager_add_and_activate_connection_async (NMManager *manager, info->manager = manager; info->simple = g_simple_async_result_new (G_OBJECT (manager), callback, user_data, nm_manager_add_and_activate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (info->simple, cancellable); info->cancellable = cancellable ? g_object_ref (cancellable) : NULL; c_list_link_tail (&priv->pending_activations, &info->lst); @@ -1164,6 +1170,8 @@ nm_manager_deactivate_connection_async (NMManager *manager, simple = g_simple_async_result_new (G_OBJECT (manager), callback, user_data, nm_manager_deactivate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); path = nm_object_get_path (NM_OBJECT (active)); nmdbus_manager_call_deactivate_connection (NM_MANAGER_GET_PRIVATE (manager)->proxy, @@ -1301,6 +1309,8 @@ init_async (GAsyncInitable *initable, int io_priority, init_data->cancellable = cancellable ? g_object_ref (cancellable) : NULL; init_data->result = g_simple_async_result_new (G_OBJECT (initable), callback, user_data, init_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (init_data->result, cancellable); g_simple_async_result_set_op_res_gboolean (init_data->result, TRUE); nm_manager_parent_async_initable_iface->init_async (initable, io_priority, cancellable, |