From d1ea17e6a41b9c9e191f110e3c7a40ddaf5309f5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 11 Mar 2014 17:18:47 -0400 Subject: [PATCH] meta-weston-launch: Adapt to Clutter's new evdev open callback --- src/wayland/meta-weston-launch.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-weston-launch.c b/src/wayland/meta-weston-launch.c index 99a444215..7d04493c2 100644 --- a/src/wayland/meta-weston-launch.c +++ b/src/wayland/meta-weston-launch.c @@ -264,6 +264,13 @@ on_evdev_device_open (const char *path, return meta_launcher_open_input_device (launcher, path, flags, error); } +static void +on_evdev_device_close (int fd, + gpointer user_data) +{ + close (fd); +} + static void handle_vt_enter (MetaLauncher *launcher) { @@ -380,7 +387,9 @@ meta_launcher_new (void) g_source_attach (self->inner_source, self->nested_context); g_source_unref (self->inner_source); - clutter_evdev_set_open_callback (on_evdev_device_open, self); + clutter_evdev_set_device_callbacks (on_evdev_device_open, + on_evdev_device_close, + self); return self; }