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-remote-settings.c | |
| parent | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff) | |
New upstream version 1.10.6 upstream/1.10.6
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 : "", |