2 files changed, 11 insertions, 10 deletions
diff --git a/src/core/display.c b/src/core/display.c
index a7e4f880..f569c461 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2836,15 +2836,13 @@ static char*
 key_event_description (Display *xdisplay,
                        XEvent  *event)
 {
-  KeySym keysym;
-  const char *str;
-
-  keysym = XKeycodeToKeysym (xdisplay, event->xkey.keycode, 0);
-
-  str = XKeysymToString (keysym);
-
-  return g_strdup_printf ("Key '%s' state 0x%x",
-                          str ? str : "none", event->xkey.state);
+#ifdef HAVE_XKB
+  KeySym keysym   = XkbKeycodeToKeysym(xdisplay, event->xkey.keycode, 0, 0);
+  const char *str = XKeysymToString (keysym);
+  return g_strdup_printf ("Key '%s' state 0x%x", str ? str : "none", event->xkey.state);
+#else
+  return "none";
+#endif
 }
 #endif /* WITH_VERBOSE_MODE */
 
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 9ddaf885..e0b2a7aa 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1273,9 +1273,12 @@ meta_display_process_key_event (MetaDisplay *display,
 
   /* window may be NULL */
 
+#ifdef HAVE_XKB
   keysym = XKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0);
-
   str = XKeysymToString (keysym);
+#else
+  str = NULL;
+#endif
 
   /* was topic */
   meta_topic (META_DEBUG_KEYBINDINGS,