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-13 12:47:11 -0400
commitd1ea17e6a41b9c9e191f110e3c7a40ddaf5309f5 (patch)
treed37d92e9caeff80c21a2cc2ccb192c18f16a2fbc
parentb37ad66e9dc674ff728966b30058aec3ea71c919 (diff)
downloadmutter-d1ea17e6a41b9c9e191f110e3c7a40ddaf5309f5.tar.gz
meta-weston-launch: Adapt to Clutter's 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 99a444215..7d04493c2 100644
--- a/src/wayland/meta-weston-launch.c
+++ b/src/wayland/meta-weston-launch.c
@@ -265,6 +265,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);
@@ -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;
}