summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2018-05-04 21:50:10 +0200
committerJonas Ådahl <jadahl@gmail.com>2018-05-07 19:20:09 +0000
commit67a4cd898e114f5ca1e2c11a2ed5f4f38215e467 (patch)
tree89f621f39078c3cb2e9dbc505531568f46f53aca
parent43d6c0ea61f257f24a3fbd9abb22d3e0a4ef9994 (diff)
downloadmutter-67a4cd898e114f5ca1e2c11a2ed5f4f38215e467.tar.gz
wayland/xdg-foreign: Send immediate destroy event to correct resource
The destroyed signal that was emitted if an imported surface was not available when created, for example if the handle was invalid or already unexported, was emitted on the wrong resource. (cherry picked from commit 98d702428857c79770b159137835622e33b84ba9)
-rw-r--r--src/wayland/meta-wayland-xdg-foreign.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wayland/meta-wayland-xdg-foreign.c b/src/wayland/meta-wayland-xdg-foreign.c
index a04b2bfa7..cecef50a9 100644
--- a/src/wayland/meta-wayland-xdg-foreign.c
+++ b/src/wayland/meta-wayland-xdg-foreign.c
@@ -384,7 +384,7 @@ xdg_importer_import (struct wl_client *client,
(!META_IS_WAYLAND_XDG_SURFACE (exported->surface->role) &&
!META_IS_WAYLAND_ZXDG_SURFACE_V6 (exported->surface->role)))
{
- zxdg_imported_v1_send_destroyed (resource);
+ zxdg_imported_v1_send_destroyed (xdg_imported_resource);
return;
}