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

libnm: disconnect signal from D-Bus proxies on dispose

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=778615
This commit is contained in:
Beniamino Galvani 2017-02-16 18:48:38 +01:00
parent ae158bf178
commit 5ae3db7515
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm/nm-device.c
View file

@ -297,6 +297,8 @@ dispose (GObject *object)
g_clear_pointer (&priv->available_connections, g_ptr_array_unref); g_clear_pointer (&priv->available_connections, g_ptr_array_unref);
g_clear_pointer (&priv->lldp_neighbors, g_ptr_array_unref); g_clear_pointer (&priv->lldp_neighbors, g_ptr_array_unref);
if (priv->proxy)
g_signal_handlers_disconnect_by_func (priv->proxy, device_state_reason_changed, object);
g_clear_object (&priv->proxy); g_clear_object (&priv->proxy);
G_OBJECT_CLASS (nm_device_parent_class)->dispose (object); G_OBJECT_CLASS (nm_device_parent_class)->dispose (object);

16
libnm/nm-object.c
View file

@ -85,6 +85,7 @@ typedef struct {
GError *reload_error; GError *reload_error;
GSList *pending; /* ordered list of pending property updates. */ GSList *pending; /* ordered list of pending property updates. */
GPtrArray *proxies;
} NMObjectPrivate; } NMObjectPrivate;
enum { enum {
@ -939,7 +940,7 @@ _nm_object_register_properties (NMObject *object,
proxy = _nm_object_get_proxy (object, interface); proxy = _nm_object_get_proxy (object, interface);
g_signal_connect (proxy, "g-properties-changed", g_signal_connect (proxy, "g-properties-changed",
G_CALLBACK (properties_changed), object); G_CALLBACK (properties_changed), object);
g_object_unref (proxy); g_ptr_array_add (priv->proxies, proxy);
instance = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); instance = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
priv->property_tables = g_slist_prepend (priv->property_tables, instance); priv->property_tables = g_slist_prepend (priv->property_tables, instance);
@ -1188,6 +1189,7 @@ nm_object_async_initable_iface_init (GAsyncInitableIface *iface)
static void static void
nm_object_init (NMObject *object) nm_object_init (NMObject *object)
{ {
NM_OBJECT_GET_PRIVATE (object)->proxies = g_ptr_array_new ();
} }
static void static void
@ -1240,6 +1242,7 @@ static void
dispose (GObject *object) dispose (GObject *object)
{ {
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object); NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
guint i;
nm_clear_g_source (&priv->notify_id); nm_clear_g_source (&priv->notify_id);
@ -1251,6 +1254,17 @@ dispose (GObject *object)
g_clear_object (&priv->object); g_clear_object (&priv->object);
g_clear_object (&priv->object_manager); g_clear_object (&priv->object_manager);
if (priv->proxies) {
for (i = 0; i < priv->proxies->len; i++) {
g_signal_handlers_disconnect_by_func (priv->proxies->pdata[i],
properties_changed,
object);
g_object_unref (priv->proxies->pdata[i]);
}
g_ptr_array_free (priv->proxies, TRUE);
priv->proxies = NULL;
}
G_OBJECT_CLASS (nm_object_parent_class)->dispose (object); G_OBJECT_CLASS (nm_object_parent_class)->dispose (object);
} }