diff --git a/src/nm-manager.c b/src/nm-manager.c index 2459e6db45..a32973b4f4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -438,7 +438,7 @@ nm_manager_update_state (NMManager *manager) } static void -ignore_cb (NMSettingsConnectionInterface *connection, GError *error, gpointer user_data) +ignore_cb (NMSysconfigConnection *connection, GError *error, gpointer user_data) { } @@ -448,7 +448,6 @@ update_active_connection_timestamp (NMManager *manager, NMDevice *device) NMActRequest *req; NMConnection *connection; NMSettingConnection *s_con; - NMSettingsConnectionInterface *connection_interface; NMManagerPrivate *priv; g_return_if_fail (NM_IS_DEVICE (device)); @@ -461,19 +460,14 @@ update_active_connection_timestamp (NMManager *manager, NMDevice *device) connection = nm_act_request_get_connection (req); g_assert (connection); - if (nm_connection_get_scope (connection) != NM_CONNECTION_SCOPE_SYSTEM) - return; - - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION)); + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); g_assert (s_con); g_object_set (s_con, NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), NULL); if (nm_setting_connection_get_read_only (s_con)) return; - connection_interface = nm_settings_interface_get_connection_by_path (NM_SETTINGS_INTERFACE (priv->sys_settings), - nm_connection_get_path (connection)); - nm_settings_connection_interface_update (connection_interface, ignore_cb, NULL); + nm_sysconfig_connection_commit_changes (NM_SYSCONFIG_CONNECTION (connection), ignore_cb, NULL); } static void diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c index 9853987ccb..8ebe196499 100644 --- a/system-settings/plugins/ifcfg-rh/plugin.c +++ b/system-settings/plugins/ifcfg-rh/plugin.c @@ -272,7 +272,7 @@ connection_new_or_changed (SCPluginIfcfg *self, /* Successfully read connection changes */ /* When the connections are the same, nothing is done */ - if (nm_connection_compare (NM_CONNECTION (connection), + if (nm_connection_compare (NM_CONNECTION (existing), NM_CONNECTION (new), NM_SETTING_COMPARE_FLAG_EXACT)) { g_object_unref (new); @@ -281,7 +281,7 @@ connection_new_or_changed (SCPluginIfcfg *self, PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path); - old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (connection)); + old_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (existing)); new_unmanaged = nm_ifcfg_connection_get_unmanaged_spec (NM_IFCFG_CONNECTION (new)); if (new_unmanaged) { diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c index cf0993bbe5..5dddf494bf 100644 --- a/system-settings/plugins/keyfile/plugin.c +++ b/system-settings/plugins/keyfile/plugin.c @@ -248,7 +248,7 @@ dir_changed (GFileMonitor *monitor, if (!nm_connection_compare (NM_CONNECTION (connection), NM_CONNECTION (tmp), NM_SETTING_COMPARE_FLAG_EXACT)) { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name); + PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", full_path); update_connection_settings (connection, tmp); } g_object_unref (tmp); @@ -260,7 +260,7 @@ dir_changed (GFileMonitor *monitor, remove_connection (SC_PLUGIN_KEYFILE (config), connection, full_path); } } else { - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name); + PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", full_path); /* New */ connection = nm_keyfile_connection_new (full_path, NULL, &error);