[mutter/wip/login1: 135/139] meta-weston-launch: Adapt the new evdev open callback



commit ef7b9c7d81f3d6d0d126424b604bde3cb37f0165
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Mar 11 17:18:47 2014 -0400

    meta-weston-launch: Adapt the new evdev open callback

 src/wayland/meta-weston-launch.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-weston-launch.c b/src/wayland/meta-weston-launch.c
index cfb17c3..4ae3288 100644
--- a/src/wayland/meta-weston-launch.c
+++ b/src/wayland/meta-weston-launch.c
@@ -239,6 +239,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);
@@ -354,7 +361,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))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]