diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:07 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:07 +0100 |
| commit | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (patch) | |
| tree | c3fca2203ad17434daf3ccf576582bd66aa41ab2 /src/settings/plugins/ifnet/nms-ifnet-connection.c | |
| parent | 417f6015c3dc8c47cf27daa59f64e0e36c521b9c (diff) | |
New upstream version 1.10.2 upstream/1.10.2
Diffstat (limited to 'src/settings/plugins/ifnet/nms-ifnet-connection.c')
| -rw-r--r-- | src/settings/plugins/ifnet/nms-ifnet-connection.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection.c b/src/settings/plugins/ifnet/nms-ifnet-connection.c index 5dbb124c..e7cd19cd 100644 --- a/src/settings/plugins/ifnet/nms-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nms-ifnet-connection.c @@ -93,7 +93,7 @@ commit_changes (NMSettingsConnection *connection, g_signal_emit (connection, signals[IFNET_CANCEL_MONITORS], 0); if (priv->conn_name) { - success = ifnet_update_parsers_by_connection (NM_CONNECTION (connection), + success = ifnet_update_parsers_by_connection (new_connection, priv->conn_name, CONF_NET_FILE, WPA_SUPPLICANT_CONF, @@ -102,7 +102,7 @@ commit_changes (NMSettingsConnection *connection, error); } else { added = TRUE; - success = ifnet_add_new_connection (NM_CONNECTION (connection), + success = ifnet_add_new_connection (new_connection, CONF_NET_FILE, WPA_SUPPLICANT_CONF, &new_name, @@ -186,11 +186,14 @@ nm_ifnet_connection_new (NMConnection *source, const char *conn_name) object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION, NULL); NM_IFNET_CONNECTION_GET_PRIVATE ((NMIfnetConnection *) object)->conn_name = g_strdup (conn_name); - if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (object), - tmp, - update_unsaved, - NULL, - NULL)) { + if (!nm_settings_connection_update (NM_SETTINGS_CONNECTION (object), + tmp, + update_unsaved + ? NM_SETTINGS_CONNECTION_PERSIST_MODE_UNSAVED + : NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP, + NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE, + NULL, + NULL)) { g_object_unref (object); return NULL; } |