From 16333ab0abfee341cf7349d9ae78e1ccab1b8de7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 10 Aug 2012 10:08:21 -0400 Subject: [PATCH] compositor: Remove compositor->seat Get rid of this quick-and-dirty assumption. --- src/compositor-android.c | 1 - src/compositor-drm.c | 2 -- src/compositor.h | 3 --- 3 files changed, 6 deletions(-) diff --git a/src/compositor-android.c b/src/compositor-android.c index 606e348..e6d57a3 100644 --- a/src/compositor-android.c +++ b/src/compositor-android.c @@ -340,7 +340,6 @@ android_seat_create(struct android_compositor *compositor) weston_seat_init(&seat->base, &compositor->base); seat->base.led_update = android_led_update; wl_list_init(&seat->devices_list); - compositor->base.seat = &seat->base; android_seat_scan_devices(seat, "/dev/input"); diff --git a/src/compositor-drm.c b/src/compositor-drm.c index 7a07610..933a273 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -2037,8 +2037,6 @@ evdev_input_create(struct weston_compositor *c, struct udev *udev, } evdev_add_devices(udev, &seat->base); - - c->seat = &seat->base; } static void diff --git a/src/compositor.h b/src/compositor.h index 85877eb..b3c554b 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -290,9 +290,6 @@ struct weston_compositor { struct wl_event_loop *input_loop; struct wl_event_source *input_loop_source; - /* There can be more than one, but not right now... */ - struct weston_seat *seat; - struct weston_layer fade_layer; struct weston_layer cursor_layer; -- 2.7.4