summaryrefslogtreecommitdiff
path: root/src/wayland/meta-xwayland.c
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-02-24 13:32:17 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2014-02-24 14:46:19 -0500
commitf0cd9b0687789f92e01d629980bbea95774f1b66 (patch)
tree46a0863e5adc3eea0a41b139ba5978278b530da5 /src/wayland/meta-xwayland.c
parent1783bf20ece7708dbf63da9a9833697c53a91a16 (diff)
downloadmutter-f0cd9b0687789f92e01d629980bbea95774f1b66.tar.gz
wayland-surface: Rework construction / destruction yet again
This time, to make way for MetaSurfaceActorEmpty. This also fixes destroy effects as a side effect. It still has issues if we try to re-assign an actor that's already toplevel (e.g. somebody re-popping up a menu that's already being destroyed), but this will be fixed soon. The idea here is that MetaWindowActor will do the unparenting of the surface actor when it itself is destroyed. To prevent bad issues with picking, we only make the surface actor reactive when it's toplevel.
Diffstat (limited to 'src/wayland/meta-xwayland.c')
-rw-r--r--src/wayland/meta-xwayland.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 36b538b30..76ca5cb66 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -47,6 +47,8 @@ xserver_set_window_id (struct wl_client *client,
if (!window)
return;
+ meta_wayland_surface_make_toplevel (surface);
+
surface->window = window;
window->surface = surface;
}