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

active-connection: don't weak-unref parent inside notify function

Browse source
This commit is contained in:
Beniamino Galvani 2016-06-29 14:31:19 +02:00
parent 7f191eb15b
commit adba47cb61
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nm-active-connection.c
View file

@ -719,14 +719,14 @@ nm_active_connection_get_assumed (NMActiveConnection *self)
/****************************************************************/
static void unwatch_parent (NMActiveConnection *self);
static void unwatch_parent (NMActiveConnection *self, gboolean unref);
static void
parent_destroyed (gpointer user_data, GObject *parent)
{
NMActiveConnection *self = user_data;
unwatch_parent (self);
unwatch_parent (self, FALSE);
g_signal_emit (self, signals[PARENT_ACTIVE], 0, NULL);
}
@ -741,19 +741,20 @@ parent_state_cb (NMActiveConnection *parent_ac,
if (parent_state < NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
return;
unwatch_parent (self);
unwatch_parent (self, TRUE);
g_signal_emit (self, signals[PARENT_ACTIVE], 0, parent_ac);
}
static void
unwatch_parent (NMActiveConnection *self)
unwatch_parent (NMActiveConnection *self, gboolean unref)
{
NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
g_signal_handlers_disconnect_by_func (priv->parent,
(GCallback) parent_state_cb,
self);
g_object_weak_unref ((GObject *) priv->parent, parent_destroyed, self);
if (unref)
g_object_weak_unref ((GObject *) priv->parent, parent_destroyed, self);
priv->parent = NULL;
}
@ -1135,7 +1136,7 @@ dispose (GObject *object)
g_clear_object (&priv->master);
if (priv->parent)
unwatch_parent (self);
unwatch_parent (self, TRUE);
g_clear_object (&priv->subject);