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 | 776c5f3893333cf3eef57fb48ede8b2fb597d395 (patch) | |
| tree | 8549fda53a9bb5e04faf2fab5a417196bf06119e /src/settings/nm-settings-connection.h | |
| parent | 9a4225ac96b627dab8b38aed67b144cd2812fbd1 (diff) | |
settings: unify settings-update API (rename and merge)
Diffstat (limited to 'src/settings/nm-settings-connection.h')
| -rw-r--r-- | src/settings/nm-settings-connection.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index 6156711973..80acf359a9 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -137,19 +137,12 @@ typedef enum { NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY, } NMSettingsConnectionPersistMode; -gboolean nm_settings_connection_commit_changes (NMSettingsConnection *self, - NMConnection *new_connection, - NMSettingsConnectionPersistMode persist_mode, - NMSettingsConnectionCommitReason commit_reason, - const char *log_diff_name, - GError **error); - -gboolean nm_settings_connection_replace_settings (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); gboolean nm_settings_connection_delete (NMSettingsConnection *self, GError **error); |