From cc760e2586cd0f98f8c60382ab8ff1f7373d9c1d Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Fri, 17 May 2013 15:00:14 -0500 Subject: Revert deprecations for issue #41 --- src/core/display.c | 4 ---- src/core/keybindings.c | 4 ---- 2 files changed, 8 deletions(-) (limited to 'src/core') diff --git a/src/core/display.c b/src/core/display.c index a7ace1b7..584ca098 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2805,11 +2805,7 @@ key_event_description (Display *xdisplay, KeySym keysym; const char *str; -#ifdef HAVE_XKB - keysym = XkbKeycodeToKeysym (xdisplay, event->xkey.keycode, 0, 0); -#else keysym = XKeycodeToKeysym (xdisplay, event->xkey.keycode, 0); -#endif str = XKeysymToString (keysym); diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 07384b22..8dda13cd 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -1273,11 +1273,7 @@ meta_display_process_key_event (MetaDisplay *display, /* window may be NULL */ -#ifdef HAVE_XKB - keysym = XkbKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0, 0); -#else keysym = XKeycodeToKeysym (display->xdisplay, event->xkey.keycode, 0); -#endif str = XKeysymToString (keysym); -- cgit v1.2.1