callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inspector: Don't leak weak references

Browse Source 
These come back to bite us when the inspector is no longer around
at the end of the program.

https://bugzilla.gnome.org/show_bug.cgi?id=759768
This commit is contained in:
Matthias Clasen
2015-12-26 21:40:19 -05:00
parent 787f600d33
commit 80a91722e5
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/inspector/object-tree.c
View File

@ -638,6 +638,32 @@ gtk_object_tree_remove_dead_object (gpointer data, GObject *dead_object)
gtk_tree_model_foreach (GTK_TREE_MODEL (wt->priv->model), remove_cb, dead_object);
}
static gboolean
weak_unref_cb (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
{
GtkInspectorObjectTree *wt = data;
GObject *object;
gtk_tree_model_get (model, iter, OBJECT, &object, -1);
g_object_weak_unref (object, gtk_object_tree_remove_dead_object, wt);
return FALSE;
}
static void
clear_store (GtkInspectorObjectTree *wt)
{
if (wt->priv->model)
{
gtk_tree_model_foreach (GTK_TREE_MODEL (wt->priv->model), weak_unref_cb, wt);
gtk_tree_store_clear (wt->priv->model);
}
}
static gboolean
map_or_unmap (GSignalInvocationHint *ihint,
guint n_params,
@ -898,6 +924,16 @@ gtk_inspector_object_tree_init (GtkInspectorObjectTree *wt)
gtk_inspector_object_tree_append_object (wt, G_OBJECT (gtk_settings_get_default ()), NULL, NULL);
}
static void
gtk_inspector_object_tree_dispose (GObject *object)
{
GtkInspectorObjectTree *wt = GTK_INSPECTOR_OBJECT_TREE (object);
clear_store (wt);
G_OBJECT_CLASS (gtk_inspector_object_tree_parent_class)->dispose (object);
}
static void
gtk_inspector_object_tree_finalize (GObject *object)
{
@ -921,6 +957,7 @@ gtk_inspector_object_tree_class_init (GtkInspectorObjectTreeClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = gtk_inspector_object_tree_finalize;
object_class->dispose = gtk_inspector_object_tree_dispose;
signals[OBJECT_ACTIVATED] =
g_signal_new ("object-activated",
@ -1127,7 +1164,7 @@ gtk_inspector_object_tree_scan (GtkInspectorObjectTree *wt,
selected = gtk_inspector_object_tree_get_selected (wt);
gtk_tree_store_clear (wt->priv->model);
clear_store (wt);
gtk_inspector_object_tree_append_object (wt, G_OBJECT (gtk_settings_get_default ()), NULL, NULL);
if (g_application_get_default ())
gtk_inspector_object_tree_append_object (wt, G_OBJECT (g_application_get_default ()), NULL, NULL);