commit e314875d00739b9c55a065b96f8040f627edb8e3
author Kristian Høgsberg <krh@bitplanet.net> Mon May 06 23:19:49 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Tue May 07 09:07:43 2013 -0400
tree 2f11f67afaea905900ca2effcffc313e277775f4
parent 4912454ba48b36153011e25eaa840db2a18c7fb7

input: Merge wl_seat into weston_seat

tests/weston-test.c

diff --git a/tests/weston-test.c b/tests/weston-test.c
index ba01a0e..612841b 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -68,7 +68,7 @@
 notify_pointer_position(struct weston_test *test, struct wl_resource *resource)
 {
 	struct weston_seat *seat = get_seat(test);
-	struct weston_pointer *pointer = seat->seat.pointer;
+	struct weston_pointer *pointer = seat->pointer;
 
 	wl_test_send_pointer_position(resource, pointer->x, pointer->y);
 }
@@ -119,7 +119,7 @@
 {
 	struct weston_test *test = resource->data;
 	struct weston_seat *seat = get_seat(test);
-	struct weston_pointer *pointer = seat->seat.pointer;
+	struct weston_pointer *pointer = seat->pointer;
 
 	test->compositor->focus = 1;
 
@@ -155,7 +155,7 @@
 
 	if (surface) {
 		weston_surface_activate(surface, seat);
-		notify_keyboard_focus_in(seat, &seat->keyboard.keys,
+		notify_keyboard_focus_in(seat, &seat->keyboard->keys,
 					 STATE_UPDATE_AUTOMATIC);
 	}
 	else {