summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-11 17:18:47 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-03-11 18:01:21 -0400
commit8fdeb17e609e179960a33cdf1427a8b732f5645f (patch)
tree602fa77e3aa6e2d582c73e9361175d23dcabf089
parent857561baedacba10c68004429cdf41092e52e86e (diff)
downloadmutter-8fdeb17e609e179960a33cdf1427a8b732f5645f.tar.gz
meta-weston-launch: Adapt the new evdev open callback
-rw-r--r--src/wayland/meta-weston-launch.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/wayland/meta-weston-launch.c b/src/wayland/meta-weston-launch.c
index 624d95146..563af2036 100644
--- a/src/wayland/meta-weston-launch.c
+++ b/src/wayland/meta-weston-launch.c
@@ -241,6 +241,13 @@ on_evdev_device_open (const char *path,
}
static void
+on_evdev_device_close (int fd,
+ gpointer user_data)
+{
+ close (fd);
+}
+
+static void
handle_vt_enter (MetaLauncher *launcher)
{
g_assert (launcher->vt_switched);
@@ -356,7 +363,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_open_callback (on_evdev_device_open,
+ on_evdev_device_close,
+ self);
#if defined(CLUTTER_WINDOWING_EGL)
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))