From f771bb88d688b5737c32fbf12246c9d220bf14df Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Feb 2014 22:23:08 -0500 Subject: [PATCH] Revert "wayland: Explicitly destroy the surface actor" This reverts commit 283a81eac0a2012ed7b1b9e758a5c5ab166d3863. This can't be done yet, as it will crash when we try to do a destroy effect from a plugin. The surface actor needs to outlive the surface in this case. Though, the unparenting happening is wrong anyway for a destroy effect. We need to figure out a sane way of doing this unparenting only after all effects have finished. --- src/wayland/meta-wayland-surface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index e8777df95..02ae53a6b 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -624,7 +624,6 @@ wl_surface_destructor (struct wl_resource *resource) surface_set_buffer (surface, NULL); double_buffered_state_destroy (&surface->pending); - clutter_actor_destroy (CLUTTER_ACTOR (surface->surface_actor)); g_object_unref (surface->surface_actor); if (surface->resource)