diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
| commit | 743faa81fda27a9c03298e8d6074623dc30db606 (patch) | |
| tree | 28418e92b22530bb05f043084626291ed1e3d46b /src/settings/plugins/ifnet/nms-ifnet-plugin.c | |
| parent | 8dda18a856c2a05cefcab6278469c9d8df30f935 (diff) | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2' with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
Diffstat (limited to 'src/settings/plugins/ifnet/nms-ifnet-plugin.c')
| -rw-r--r-- | src/settings/plugins/ifnet/nms-ifnet-plugin.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/settings/plugins/ifnet/nms-ifnet-plugin.c b/src/settings/plugins/ifnet/nms-ifnet-plugin.c index 998b04b4..38d23f30 100644 --- a/src/settings/plugins/ifnet/nms-ifnet-plugin.c +++ b/src/settings/plugins/ifnet/nms-ifnet-plugin.c @@ -269,11 +269,12 @@ reload_connections (NMSettingsPlugin *config) } } else { /* Update existing connection with new settings */ - if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (old), - NM_CONNECTION (new), - FALSE, /* don't set Unsaved */ - "ifnet-update", - &error)) { + if (!nm_settings_connection_update (NM_SETTINGS_CONNECTION (old), + NM_CONNECTION (new), + NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP, + NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE, + "ifnet-update", + &error)) { /* Shouldn't ever get here as 'new' was verified by the reader already * and the UUID did not change. */ g_assert_not_reached (); @@ -519,5 +520,5 @@ settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface) G_MODULE_EXPORT GObject * nm_settings_plugin_factory (void) { - return g_object_ref (settings_plugin_ifnet_get ()); + return G_OBJECT (g_object_ref (settings_plugin_ifnet_get ())); } |