AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

widgetpaintable: Clear an idle in dispose

Browse Source 
We were not removing the pending_update idle
in dispose, which is at least suspicious, if
not deadly. Move the idle cleanup code into
unset_widget(), which we are already calling
in dispose().
This commit is contained in:
Matthias Clasen 2020-08-06 20:01:26 -04:00
parent 12450cfcef
commit a712ffa2ab
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkwidgetpaintable.c
View File

@ -201,6 +201,13 @@ gtk_widget_paintable_unset_widget (GtkWidgetPaintable *self)
self); self);
self->widget = NULL; self->widget = NULL;
g_clear_object (&self->pending_image);
if (self->pending_update_cb)
{
g_source_remove (self->pending_update_cb);
self->pending_update_cb = 0;
}
} }
static void static void
@ -332,19 +339,10 @@ gtk_widget_paintable_set_widget (GtkWidgetPaintable *self,
self->widget = widget; self->widget = widget;
if (widget) if (widget)
{ widget->priv->paintables = g_slist_prepend (widget->priv->paintables, self);
widget->priv->paintables = g_slist_prepend (widget->priv->paintables,
self);
}
g_object_unref (self->current_image); g_object_unref (self->current_image);
self->current_image = gtk_widget_paintable_snapshot_widget (self); self->current_image = gtk_widget_paintable_snapshot_widget (self);
g_clear_object (&self->pending_image);
if (self->pending_update_cb)
{
g_source_remove (self->pending_update_cb);
self->pending_update_cb = 0;
}
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WIDGET]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WIDGET]);
gdk_paintable_invalidate_size (GDK_PAINTABLE (self)); gdk_paintable_invalidate_size (GDK_PAINTABLE (self));