fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: unify settings-update API (drop internal _update())

Browse source 
(cherry picked from commit 141dfd600c)
This commit is contained in:
Thomas Haller 2017-12-01 10:09:43 +01:00
parent 570056af7b
commit aaf0973c26
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/settings/nm-settings-connection.c
View file

@ -552,13 +552,13 @@ _update_prepare (NMSettingsConnection *self,
return TRUE; return TRUE;
} }
static gboolean gboolean
_update (NMSettingsConnection *self, nm_settings_connection_update (NMSettingsConnection *self,
NMConnection *new_connection, NMConnection *new_connection,
NMSettingsConnectionPersistMode persist_mode, NMSettingsConnectionPersistMode persist_mode,
NMSettingsConnectionCommitReason commit_reason, NMSettingsConnectionCommitReason commit_reason,
const char *log_diff_name, const char *log_diff_name,
GError **error) GError **error)
{ {
NMSettingsConnectionPrivate *priv; NMSettingsConnectionPrivate *priv;
NMSettingsConnectionClass *klass = NULL; NMSettingsConnectionClass *klass = NULL;
@ -693,22 +693,6 @@ out:
return TRUE; 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 static void
remove_entry_from_db (NMSettingsConnection *self, const char* db_name) remove_entry_from_db (NMSettingsConnection *self, const char* db_name)
{ {
@ -1734,12 +1718,12 @@ update_auth_cb (NMSettingsConnection *self,
TRUE); TRUE);
} }
_update (self, nm_settings_connection_update (self,
info->new_settings, info->new_settings,
persist_mode, persist_mode,
commit_reason, commit_reason,
log_diff_name, log_diff_name,
&local); &local);
if (!local) { if (!local) {
gs_unref_object NMConnection *for_agent = NULL; gs_unref_object NMConnection *for_agent = NULL;