diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-12-01 10:09:43 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-05 19:57:24 +0100 |
| commit | 141dfd600c7d9fe43fb6d603127318f2944c9d7f (patch) | |
| tree | 0c239bb0e2bf3872bb7b23f2d01a25bc5997131b | |
| parent | 776c5f3893333cf3eef57fb48ede8b2fb597d395 (diff) | |
| download | NetworkManager-141dfd600c7d9fe43fb6d603127318f2944c9d7f.tar.gz | |
settings: unify settings-update API (drop internal _update())
| -rw-r--r-- | src/settings/nm-settings-connection.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 00a5bb0c05..3c6e62be38 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -552,13 +552,13 @@ _update_prepare (NMSettingsConnection *self, return TRUE; } -static gboolean -_update (NMSettingsConnection *self, - NMConnection *new_connection, - NMSettingsConnectionPersistMode persist_mode, - NMSettingsConnectionCommitReason commit_reason, - const char *log_diff_name, - GError **error) +gboolean +nm_settings_connection_update (NMSettingsConnection *self, + NMConnection *new_connection, + NMSettingsConnectionPersistMode persist_mode, + NMSettingsConnectionCommitReason commit_reason, + const char *log_diff_name, + GError **error) { NMSettingsConnectionPrivate *priv; NMSettingsConnectionClass *klass = NULL; @@ -693,22 +693,6 @@ out: return TRUE; } -gboolean -nm_settings_connection_update (NMSettingsConnection *self, - NMConnection *new_connection, - NMSettingsConnectionPersistMode persist_mode, - NMSettingsConnectionCommitReason commit_reason, - const char *log_diff_name, - GError **error) -{ - return _update (self, - new_connection, - persist_mode, - commit_reason, - log_diff_name, - error); -} - static void remove_entry_from_db (NMSettingsConnection *self, const char* db_name) { @@ -1734,12 +1718,12 @@ update_auth_cb (NMSettingsConnection *self, TRUE); } - _update (self, - info->new_settings, - persist_mode, - commit_reason, - log_diff_name, - &local); + nm_settings_connection_update (self, + info->new_settings, + persist_mode, + commit_reason, + log_diff_name, + &local); if (!local) { gs_unref_object NMConnection *for_agent = NULL; |