fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 13:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: refactor connection_changed()

Browse source 
Again, no functional change.
This commit is contained in:
Thomas Haller 2016-04-13 13:45:47 +02:00
parent 866df17e97
commit f7e7df772d
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -472,6 +472,15 @@ emit_updated (NMSettingsConnection *self)
return FALSE;
}
static void
emit_updated_schedule (NMSettingsConnection *self)
{
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
if (priv->updated_idle_id == 0)
priv->updated_idle_id = g_idle_add ((GSourceFunc) emit_updated, self);
}
static void
set_unsaved (NMSettingsConnection *self, gboolean now_unsaved)
{
@ -489,21 +498,11 @@ set_unsaved (NMSettingsConnection *self, gboolean now_unsaved)
}
}
static void
connection_changed (NMSettingsConnection *self, gboolean update_unsaved)
{
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
if (update_unsaved)
set_unsaved (self, TRUE);
if (priv->updated_idle_id == 0)
priv->updated_idle_id = g_idle_add ((GSourceFunc) emit_updated, self);
}
static void
connection_changed_cb (NMSettingsConnection *self, gpointer unused)
{
connection_changed (self, TRUE);
set_unsaved (self, TRUE);
emit_updated_schedule (self);
}
/* Update the settings of this connection to match that of 'new_connection',
@ -583,7 +582,10 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self,
/* Manually emit changed signal since we disconnected the handler, but
* only update Unsaved if the caller wanted us to.
*/
connection_changed (self, update_unsaved);
if (update_unsaved)
set_unsaved (self, TRUE);
emit_updated_schedule (self);
g_signal_emit (self, signals[UPDATED_BY_USER], 0);