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

device/macvlan: implement dispose()

Browse source 
When the object gets disposed, parent must be unreferenced and signals
disconnected.

Fixes: 4de8851eca

https://bugzilla.redhat.com/show_bug.cgi?id=1299803
This commit is contained in:
Beniamino Galvani 2016-01-19 13:52:21 +01:00
parent 15ab4bda5b
commit f607a16994
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/devices/nm-device-macvlan.c
View file

@ -139,8 +139,7 @@ nm_device_macvlan_set_parent (NMDeviceMacvlan *self, NMDevice *parent)
if (parent == priv->parent)
return;
if (priv->parent_state_id)
nm_clear_g_signal_handler (priv->parent, &priv->parent_state_id);
nm_clear_g_signal_handler (priv->parent, &priv->parent_state_id);
g_clear_object (&priv->parent);
@ -620,6 +619,14 @@ set_property (GObject *object, guint prop_id,
}
}
static void
dispose (GObject *object)
{
nm_device_macvlan_set_parent (NM_DEVICE_MACVLAN (object), NULL);
G_OBJECT_CLASS (nm_device_macvlan_parent_class)->dispose (object);
}
static void
nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass)
{
@ -630,6 +637,7 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass)
NM_DEVICE_CLASS_DECLARE_TYPES (klass, NULL, NM_LINK_TYPE_MACVLAN, NM_LINK_TYPE_MACVTAP)
object_class->dispose = dispose;
object_class->get_property = get_property;
object_class->set_property = set_property;