AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

inspector: Don't leak signal handlers

Browse Source 
Not only was the property list connecting to notify::bla for
each property individually, it was also leaking the signal
handlers when the selected object changed. Fix both.
This commit is contained in:
Matthias Clasen 2014-05-08 18:36:38 -04:00
parent 86adead803
commit e249c6d6ee
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/inspector/prop-list.c
View File

@ -48,7 +48,7 @@ struct _GtkInspectorPropListPrivate
GObject *object;
GtkListStore *model;
GHashTable *prop_iters;
GList *signal_cnxs;
gulong notify_handler_id;
GtkWidget *widget_tree;
GtkCellRenderer *value_renderer;
gboolean child_properties;
@ -240,28 +240,22 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
GParamSpec **props;
guint num_properties;
guint i;
GList *l;
if (pl->priv->object == object)
return FALSE;
pl->priv->object = object;
for (l = pl->priv->signal_cnxs; l != NULL; l = l->next)
if (pl->priv->notify_handler_id != 0)
{
gulong id = GPOINTER_TO_UINT (l->data);
if (g_signal_handler_is_connected (object, id))
g_signal_handler_disconnect (object, id);
g_signal_handler_disconnect (pl->priv->object, pl->priv->notify_handler_id);
pl->priv->notify_handler_id = 0;
}
g_list_free (pl->priv->signal_cnxs);
pl->priv->signal_cnxs = NULL;
g_hash_table_remove_all (pl->priv->prop_iters);
gtk_list_store_clear (pl->priv->model);
gtk_widget_set_sensitive (GTK_WIDGET (pl), FALSE);
pl->priv->object = object;
if (pl->priv->child_properties)
{
GtkWidget *parent;
@ -283,7 +277,6 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
for (i = 0; i < num_properties; i++)
{
GParamSpec *prop = props[i];
gchar *signal_name;
if (! (prop->flags & G_PARAM_READABLE))
continue;
@ -292,20 +285,14 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
gtk_inspector_prop_list_update_prop (pl, &iter, prop);
g_hash_table_insert (pl->priv->prop_iters, (gpointer) prop->name, gtk_tree_iter_copy (&iter));
}
/* Listen for updates */
if (pl->priv->child_properties)
signal_name = g_strdup_printf ("child-notify::%s", prop->name);
else
signal_name = g_strdup_printf ("notify::%s", prop->name);
pl->priv->signal_cnxs =
g_list_prepend (pl->priv->signal_cnxs,
GINT_TO_POINTER (g_signal_connect (object, signal_name,
G_CALLBACK (gtk_inspector_prop_list_prop_changed_cb), pl)));
g_free (signal_name);
}
pl->priv->notify_handler_id =
g_signal_connect (object,
pl->priv->child_properties ? "child-notify" : "notify",
G_CALLBACK (gtk_inspector_prop_list_prop_changed_cb),
pl);
g_object_set (pl->priv->attribute_column,
"visible", !pl->priv->child_properties && GTK_IS_CELL_RENDERER (object),