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

gtkstylecontext: Don't try to emit a signal when finalizing

Browse Source
This commit is contained in:
Jasper St. Pierre
2014-12-28 18:11:49 -08:00
parent ecc64f63e4
commit 5a41f63426
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkstylecontext.c
View File

@ -522,6 +522,18 @@ _gtk_style_context_update_animating (GtkStyleContext *context)
gtk_style_context_stop_animating (context);
}
static void
gtk_style_context_clear_parent (GtkStyleContext *context)
{
GtkStyleContextPrivate *priv = context->priv;
if (priv->parent)
{
priv->parent->priv->children = g_slist_remove (priv->parent->priv->children, context);
g_object_unref (priv->parent);
}
}
static void
gtk_style_context_finalize (GObject *object)
{
@ -536,7 +548,7 @@ gtk_style_context_finalize (GObject *object)
/* children hold a reference to us */
g_assert (priv->children == NULL);
gtk_style_context_set_parent (style_context, NULL);
gtk_style_context_clear_parent (style_context);
gtk_style_context_set_cascade (style_context, NULL);
@ -1397,11 +1409,7 @@ gtk_style_context_set_parent (GtkStyleContext *context,
gtk_style_context_set_invalid (parent, TRUE);
}
if (priv->parent)
{
priv->parent->priv->children = g_slist_remove (priv->parent->priv->children, context);
g_object_unref (priv->parent);
}
gtk_style_context_clear_parent (context);
priv->parent = parent;