From 9fa47035ac3be11df2d1899fb7a5dfe151021998 Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Sun, 29 Jun 2008 22:19:20 +0000 Subject: [PATCH] 2008-06-29 Matthew Allum * clutter/x11/clutter-event-x11.c: ifdef convert_xdevicekey_to_xkey () with XINPUT check. (fix via Andy Wingo) --- ChangeLog | 6 ++++++ clutter/x11/clutter-event-x11.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index f43b40810..92dcacb52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-29 Matthew Allum + + * clutter/x11/clutter-event-x11.c: + ifdef convert_xdevicekey_to_xkey () with XINPUT check. + (fix via Andy Wingo) + 2008-06-29 Tommi Komulainen * clutter/osx/clutter-osx.h (_clutter_event_osx_put) diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index 3d45dda9d..1887c1a6e 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -219,6 +219,7 @@ set_user_time (ClutterBackendX11 *backend_x11, } } +#ifdef USE_XINPUT static void convert_xdevicekey_to_xkey (XDeviceKeyEvent *xkev, XEvent *xevent) { @@ -237,6 +238,7 @@ convert_xdevicekey_to_xkey (XDeviceKeyEvent *xkev, XEvent *xevent) xevent->xkey.keycode = xkev->keycode; xevent->xkey.same_screen = xkev->same_screen; } +#endif static void translate_key_event (ClutterBackend *backend,