[clutter/clutter-1.14] evdev: Fix use of the common XKB code for the evdev device
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.14] evdev: Fix use of the common XKB code for the evdev device
- Date: Fri, 8 Feb 2013 12:13:26 +0000 (UTC)
commit 9d43336e0368bd5a78436e3436a0a1a7383e1de6
Author: Neil Roberts <neil linux intel com>
Date: Thu Feb 7 17:20:39 2013 +0000
evdev: Fix use of the common XKB code for the evdev device
In commit 8f4e39b6d716 the Wayland code was updated to use the new
xkbcommon API. This involved changing the common XKB code shared with
the evdev input backend. However the evdev input backend was not
modified so it wouldn't compile. This patch just makes a minor change
to update it.
https://bugzilla.gnome.org/show_bug.cgi?id=693348
(cherry picked from commit d0d1b562bd2a46ab9073507b42e106cb209038b8)
clutter/evdev/clutter-device-manager-evdev.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index 7afcc0a..101c955 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -494,10 +494,10 @@ clutter_event_source_new (ClutterInputDeviceEvdev *input_device)
if (type == CLUTTER_KEYBOARD_DEVICE)
{
/* create the xkb description */
- event_source->xkb = _clutter_xkb_desc_new (NULL,
- option_xkb_layout,
- option_xkb_variant,
- option_xkb_options);
+ event_source->xkb = _clutter_xkb_state_new (NULL,
+ option_xkb_layout,
+ option_xkb_variant,
+ option_xkb_options);
if (G_UNLIKELY (event_source->xkb == NULL))
{
g_warning ("Could not compile keymap %s:%s:%s", option_xkb_layout,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]