diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-29 19:23:05 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-05 21:24:22 +0100 |
| commit | f3b97cac0e0f18622f90a4a7b8af4d9e5b7f5d7d (patch) | |
| tree | 90c5531ee1003d6336440f14f5706103ce753895 | |
| parent | ef8a29145c2ea5e0c1fc4a30752703099fc73f28 (diff) | |
| download | NetworkManager-f3b97cac0e0f18622f90a4a7b8af4d9e5b7f5d7d.tar.gz | |
settings: split nm_settings_connection_commit_changes() to call it without preparing the new connection
Will be used next.
(cherry picked from commit 75f787d1da309166ce6b5a9df4ddfe681b85b6cb)
| -rw-r--r-- | src/settings/nm-settings-connection.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 64fec2b12d..54b3de1621 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -655,11 +655,12 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self, error); } -gboolean -nm_settings_connection_commit_changes (NMSettingsConnection *self, - NMConnection *new_connection, - NMSettingsConnectionCommitReason commit_reason, - GError **error) +static gboolean +_commit_changes_full (NMSettingsConnection *self, + NMConnection *new_connection, + gboolean prepare_new_connection, + NMSettingsConnectionCommitReason commit_reason, + GError **error) { NMSettingsConnectionClass *klass; gs_free_error GError *local = NULL; @@ -679,7 +680,8 @@ nm_settings_connection_commit_changes (NMSettingsConnection *self, return FALSE; } - if ( new_connection + if ( prepare_new_connection + && new_connection && !nm_settings_connection_replace_settings_prepare (self, new_connection, &local)) { @@ -731,6 +733,19 @@ nm_settings_connection_commit_changes (NMSettingsConnection *self, return TRUE; } +gboolean +nm_settings_connection_commit_changes (NMSettingsConnection *self, + NMConnection *new_connection, + NMSettingsConnectionCommitReason commit_reason, + GError **error) +{ + return _commit_changes_full (self, + new_connection, + TRUE, + commit_reason, + error); +} + static void remove_entry_from_db (NMSettingsConnection *self, const char* db_name) { |