From 46cf95d36b29cd6bda18ba2d511be10b8e9471cc Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 20 Jan 2008 03:33:51 -0500 Subject: make menu event handling work more like how other events are handled, less special-casey --- obt/keyboard.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'obt') diff --git a/obt/keyboard.c b/obt/keyboard.c index a93c07d0..710a94c2 100644 --- a/obt/keyboard.c +++ b/obt/keyboard.c @@ -200,18 +200,17 @@ KeyCode obt_keyboard_keysym_to_keycode(KeySym sym) gchar *obt_keyboard_keycode_to_string(guint keycode) { KeySym sym; - const gchar *ret = NULL; if ((sym = XKeycodeToKeysym(obt_display, keycode, 0)) != NoSymbol) - ret = XKeysymToString(sym); - return g_locale_to_utf8(ret, -1, NULL, NULL, NULL); + return g_locale_to_utf8(XKeysymToString(sym), -1, NULL, NULL, NULL); + return NULL; } gunichar obt_keyboard_keycode_to_unichar(guint keycode) { gunichar unikey = 0; - char *key; + if ((key = obt_keyboard_keycode_to_string(keycode)) != NULL && /* don't accept keys that aren't a single letter, like "space" */ key[1] == '\0') -- cgit v1.2.3