1
0
Fork 0

renderer: Cleanup views in dispose

The views needs to be cleaned up before things cleaned up on finalize
that they depend on existing, so do so in dispose().

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1822>
This commit is contained in:
Jonas Ådahl 2021-04-10 00:50:30 +02:00 committed by Marge Bot
parent 558cb4fac3
commit abf2f17387

View file

@ -366,14 +366,14 @@ meta_renderer_set_property (GObject *object,
}
static void
meta_renderer_finalize (GObject *object)
meta_renderer_dispose (GObject *object)
{
MetaRenderer *renderer = META_RENDERER (object);
MetaRendererPrivate *priv = meta_renderer_get_instance_private (renderer);
g_clear_list (&priv->views, g_object_unref);
G_OBJECT_CLASS (meta_renderer_parent_class)->finalize (object);
G_OBJECT_CLASS (meta_renderer_parent_class)->dispose (object);
}
static void
@ -388,7 +388,7 @@ meta_renderer_class_init (MetaRendererClass *klass)
object_class->get_property = meta_renderer_get_property;
object_class->set_property = meta_renderer_set_property;
object_class->finalize = meta_renderer_finalize;
object_class->dispose = meta_renderer_dispose;
klass->rebuild_views = meta_renderer_real_rebuild_views;
klass->get_views_for_monitor = meta_renderer_real_get_views_for_monitor;