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

keep-alive: cleanup tracking visible state of connection

Browse source 
- in nm_keep_alive_set_settings_connection_watch_visible(), abort
  early when setting the same connection again (or %NULL again).

- nm_keep_alive_set_settings_connection_watch_visible() would (already
  before) correctly disconnect the signal handler from the previous
  connection.
  As we anyway do explict disconnects, avoid the overhead of a weak
  pointer with g_signal_connect_object(). Just reuse the same
  setter to disconnect the signal in dispose().

- fix leaking priv->connection in nm_keep_alive_set_settings_connection_watch_visible().

- use g_signal_handlers_disconnect_by_func(), to be more specific about
  which signal we want to disconnect.
This commit is contained in:
Thomas Haller 2018-11-17 12:56:14 +01:00
parent be91d1cc4e
commit 3baf56b474
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/nm-keep-alive.c
View file

@ -135,22 +135,41 @@ connection_flags_changed (NMSettingsConnection *connection,
_notify_alive (self);
}
static void
_set_settings_connection_watch_visible (NMKeepAlive *self,
NMSettingsConnection *connection,
gboolean emit_signal)
{
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
gs_unref_object NMSettingsConnection *old_connection = NULL;
if (priv->connection == connection)
return;
if (priv->connection) {
g_signal_handlers_disconnect_by_func (priv->connection,
G_CALLBACK (connection_flags_changed),
self);
old_connection = g_steal_pointer (&priv->connection);
}
if (connection) {
priv->connection = g_object_ref (connection);
g_signal_connect (priv->connection,
NM_SETTINGS_CONNECTION_FLAGS_CHANGED,
G_CALLBACK (connection_flags_changed),
self);
}
if (emit_signal)
_notify_alive (self);
}
void
nm_keep_alive_set_settings_connection_watch_visible (NMKeepAlive *self,
NMSettingsConnection *connection)
{
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
if (priv->connection) {
g_signal_handlers_disconnect_by_data (priv->connection, self);
priv->connection = NULL;
}
priv->connection = g_object_ref (connection);
g_signal_connect_object (priv->connection, NM_SETTINGS_CONNECTION_FLAGS_CHANGED,
G_CALLBACK (connection_flags_changed), self, 0);
_notify_alive (self);
_set_settings_connection_watch_visible (self, connection, TRUE);
}
/*****************************************************************************/
@ -265,10 +284,8 @@ static void
dispose (GObject *object)
{
NMKeepAlive *self = NM_KEEP_ALIVE (object);
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
g_clear_object (&priv->connection);
_set_settings_connection_watch_visible (self, NULL, FALSE);
cleanup_dbus_watch (self);
}