From b65649186d8487ea3aefad5da0c1a609543e329e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 17 Feb 2014 19:15:54 -0500 Subject: [PATCH] pointer/keyboard: Put the destroy listener on the right resource We care about when the surface is destroyed, not when the wl_pointer slash wl_keyboard resource is destroyed. --- src/wayland/meta-wayland-keyboard.c | 2 +- src/wayland/meta-wayland-pointer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c index 3c4d1ee9a..2787bb01d 100644 --- a/src/wayland/meta-wayland-keyboard.c +++ b/src/wayland/meta-wayland-keyboard.c @@ -556,7 +556,7 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard, wl_keyboard_send_enter (resource, serial, surface->resource, &keyboard->keys); } - wl_resource_add_destroy_listener (resource, &keyboard->focus_surface_listener); + wl_resource_add_destroy_listener (surface->resource, &keyboard->focus_surface_listener); keyboard->focus_serial = serial; meta_wayland_surface_focused_set (surface); diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index a0ab56a93..189a99bd0 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -364,7 +364,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, wl_fixed_to_int (pointer->x), wl_fixed_to_int (pointer->y)); wl_pointer_send_enter (resource, serial, surface->resource, sx, sy); - wl_resource_add_destroy_listener (resource, &pointer->focus_surface_listener); + wl_resource_add_destroy_listener (surface->resource, &pointer->focus_surface_listener); pointer->focus_serial = serial; }