diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-06-01 12:14:00 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-06-01 10:38:00 -0400 |
| commit | cd981ddf1dd6788a7dfb8323d7bf63817266db96 (patch) | |
| tree | cd0a3d07cecf99d4f4b5ef2d257e73f2366d8098 | |
| parent | cfd0e726cc13f7eb341cc5a1444d2153b5b516b0 (diff) | |
compositor-wayland: Fix seat vs. seat confusion
We were accidentally trying to initialise the wl_seat we just got from
our host server as a weston_seat, rather than the weston_seat we set up
earlier ...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | src/compositor-wayland.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 60fb9d9..51163f7 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -639,7 +639,7 @@ input_handle_capabilities(void *data, struct wl_seat *seat, wl_pointer_set_user_data(input->pointer, input); wl_pointer_add_listener(input->pointer, &pointer_listener, input); - weston_seat_init_pointer((struct weston_seat *) seat); + weston_seat_init_pointer(input->compositor->base.seat); } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) { wl_pointer_destroy(input->pointer); input->pointer = NULL; @@ -650,7 +650,7 @@ input_handle_capabilities(void *data, struct wl_seat *seat, wl_keyboard_set_user_data(input->keyboard, input); wl_keyboard_add_listener(input->keyboard, &keyboard_listener, input); - weston_seat_init_keyboard((struct weston_seat *) seat, NULL); + weston_seat_init_keyboard(input->compositor->base.seat, NULL); } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) { wl_keyboard_destroy(input->keyboard); input->keyboard = NULL; |