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-client.c | |
| parent | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff) | |
New upstream version 1.10.6 upstream/1.10.6
Diffstat (limited to 'libnm/nm-client.c')
| -rw-r--r-- | libnm/nm-client.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c index c5a6f1cf..4653b272 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -718,6 +718,8 @@ nm_client_check_connectivity_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_check_connectivity_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_manager_check_connectivity_async (NM_CLIENT_GET_PRIVATE (client)->manager, cancellable, check_connectivity_cb, simple); } @@ -827,6 +829,8 @@ nm_client_save_hostname_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_save_hostname_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_remote_settings_save_hostname_async (NM_CLIENT_GET_PRIVATE (client)->settings, hostname, cancellable, save_hostname_cb, simple); @@ -1114,6 +1118,8 @@ nm_client_activate_connection_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_activate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_manager_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->manager, connection, device, specific_object, cancellable, activate_cb, simple); @@ -1219,6 +1225,8 @@ nm_client_add_and_activate_connection_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_add_and_activate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_manager_add_and_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->manager, partial, device, specific_object, cancellable, add_activate_cb, simple); @@ -1322,6 +1330,8 @@ nm_client_deactivate_connection_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_deactivate_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); if (!_nm_client_check_nm_running (client, NULL)) { g_simple_async_result_set_op_res_gboolean (simple, TRUE); @@ -1528,6 +1538,8 @@ nm_client_add_connection_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_add_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_remote_settings_add_connection_async (NM_CLIENT_GET_PRIVATE (client)->settings, connection, save_to_disk, cancellable, add_connection_cb, simple); @@ -1653,6 +1665,8 @@ nm_client_load_connections_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_load_connections_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_remote_settings_load_connections_async (NM_CLIENT_GET_PRIVATE (client)->settings, filenames, cancellable, load_connections_cb, simple); @@ -1765,6 +1779,8 @@ nm_client_reload_connections_async (NMClient *client, simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data, nm_client_reload_connections_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nm_remote_settings_reload_connections_async (NM_CLIENT_GET_PRIVATE (client)->settings, cancellable, reload_connections_cb, simple); } @@ -1931,6 +1947,8 @@ nm_client_new_async (GCancellable *cancellable, GSimpleAsyncResult *simple; simple = g_simple_async_result_new (NULL, callback, user_data, nm_client_new_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); g_async_initable_new_async (NM_TYPE_CLIENT, G_PRIORITY_DEFAULT, cancellable, client_inited, simple, @@ -2564,6 +2582,8 @@ prepare_object_manager (NMClient *client, init_data->cancellable = cancellable ? g_object_ref (cancellable) : NULL; init_data->result = g_simple_async_result_new (G_OBJECT (client), 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); g_dbus_object_manager_client_new_for_bus (_nm_dbus_bus_type (), |