From 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Mar 2018 01:29:54 +0100 Subject: New upstream version 1.10.6 --- libnm/nm-remote-settings.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libnm/nm-remote-settings.c') 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 : "", -- cgit 1.3.0-6-gf8a5