diff options
| author | Scott Balneaves <[email protected]> | 2013-05-17 15:00:14 -0500 |
|---|---|---|
| committer | Scott Balneaves <[email protected]> | 2013-05-17 15:00:14 -0500 |
| commit | cc760e2586cd0f98f8c60382ab8ff1f7373d9c1d (patch) | |
| tree | 450b3338111f01785ef6d6a3be95a52b4dc54de0 | |
| parent | 7318946f007404ed8b44cc030358c3d278d1b8cf (diff) | |
| download | marco-cc760e2586cd0f98f8c60382ab8ff1f7373d9c1d.tar.bz2 marco-cc760e2586cd0f98f8c60382ab8ff1f7373d9c1d.tar.xz | |
Revert deprecations for issue #41
| -rw-r--r-- | src/core/display.c | 4 | ||||
| -rw-r--r-- | src/core/keybindings.c | 4 |
2 files changed, 0 insertions, 8 deletions
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); |