fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-03 11:20:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: refactor connection-changed handler

Browse source 
No change in behavior, just not pass on this GUINT_TO_POINTER (TRUE).

(cherry picked from commit 866df17e97)
This commit is contained in:
Thomas Haller 2016-04-13 13:42:02 +02:00 • committed by Beniamino Galvani
parent c70d6bf498
commit 6359213ea4
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -490,10 +490,8 @@ set_unsaved (NMSettingsConnection *self, gboolean now_unsaved)
}
static void
changed_cb (NMSettingsConnection *self, gpointer user_data)
connection_changed (NMSettingsConnection *self, gboolean update_unsaved)
{
gboolean update_unsaved = !!user_data;
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
if (update_unsaved)
@ -502,6 +500,12 @@ changed_cb (NMSettingsConnection *self, gpointer user_data)
priv->updated_idle_id = g_idle_add ((GSourceFunc) emit_updated, self);
}
static void
connection_changed_cb (NMSettingsConnection *self, gpointer unused)
{
connection_changed (self, TRUE);
}
/* Update the settings of this connection to match that of 'new_connection',
* taking care to make a private copy of secrets.
*/
@ -542,7 +546,7 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self,
/* Disconnect the changed signal to ensure we don't set Unsaved when
* it's not required.
*/
g_signal_handlers_block_by_func (self, G_CALLBACK (changed_cb), GUINT_TO_POINTER (TRUE));
g_signal_handlers_block_by_func (self, G_CALLBACK (connection_changed_cb), NULL);
if (log_diff_name)
nm_utils_log_connection_diff (new_connection, NM_CONNECTION (self), LOGL_DEBUG, LOGD_CORE, log_diff_name, "++ ");
@ -579,11 +583,11 @@ 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.
*/
changed_cb (self, GUINT_TO_POINTER (update_unsaved));
connection_changed (self, update_unsaved);
g_signal_emit (self, signals[UPDATED_BY_USER], 0);
g_signal_handlers_unblock_by_func (self, G_CALLBACK (changed_cb), GUINT_TO_POINTER (TRUE));
g_signal_handlers_unblock_by_func (self, G_CALLBACK (connection_changed_cb), NULL);
return success;
}
@ -2581,7 +2585,7 @@ nm_settings_connection_init (NMSettingsConnection *self)
priv->autoconnect_blocked_reason = NM_DEVICE_STATE_REASON_NONE;
g_signal_connect (self, NM_CONNECTION_SECRETS_CLEARED, G_CALLBACK (secrets_cleared_cb), NULL);
g_signal_connect (self, NM_CONNECTION_CHANGED, G_CALLBACK (changed_cb), GUINT_TO_POINTER (TRUE));
g_signal_connect (self, NM_CONNECTION_CHANGED, G_CALLBACK (connection_changed_cb), NULL);
}
static void
@ -2615,11 +2619,11 @@ dispose (GObject *object)
nm_clear_g_source (&priv->updated_idle_id);
/* Disconnect handlers.
* changed_cb() has to be disconnected *before* nm_connection_clear_secrets(),
* connection_changed_cb() has to be disconnected *before* nm_connection_clear_secrets(),
* because nm_connection_clear_secrets() emits NM_CONNECTION_CHANGED signal.
*/
g_signal_handlers_disconnect_by_func (self, G_CALLBACK (secrets_cleared_cb), NULL);
g_signal_handlers_disconnect_by_func (self, G_CALLBACK (changed_cb), GUINT_TO_POINTER (TRUE));
g_signal_handlers_disconnect_by_func (self, G_CALLBACK (connection_changed_cb), NULL);
nm_connection_clear_secrets (NM_CONNECTION (self));
g_clear_object (&priv->system_secrets);