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-remote-settings.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-remote-settings.c')
| -rw-r--r-- | libnm/nm-remote-settings.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 4d846424..2339e872 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -315,6 +315,8 @@ nm_remote_settings_add_connection_async (NMRemoteSettings *settings, info->self = settings; info->simple = g_simple_async_result_new (G_OBJECT (settings), callback, user_data, nm_remote_settings_add_connection_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (info->simple, cancellable); info->saved = save_to_disk; new_settings = nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL); @@ -415,6 +417,8 @@ nm_remote_settings_load_connections_async (NMRemoteSettings *settings, simple = g_simple_async_result_new (G_OBJECT (settings), callback, user_data, nm_remote_settings_load_connections_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nmdbus_settings_call_load_connections (priv->proxy, (const char * const *) filenames, @@ -497,6 +501,8 @@ nm_remote_settings_reload_connections_async (NMRemoteSettings *settings, simple = g_simple_async_result_new (G_OBJECT (settings), callback, user_data, nm_remote_settings_reload_connections_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nmdbus_settings_call_reload_connections (priv->proxy, cancellable, reload_connections_cb, simple); @@ -574,6 +580,8 @@ nm_remote_settings_save_hostname_async (NMRemoteSettings *settings, simple = g_simple_async_result_new (G_OBJECT (settings), callback, user_data, nm_remote_settings_save_hostname_async); + if (cancellable) + g_simple_async_result_set_check_cancellable (simple, cancellable); nmdbus_settings_call_save_hostname (priv->proxy, hostname ? hostname : "", |