strip leading/trailing whitespace off stuff when reading it from the configs

[chaz/openbox] / obt / keyboard.c

diff --git a/obt/keyboard.c b/obt/keyboard.c
index a93c07d080d5a37f9f5d48d0a326cb47b9c4efca..699fa8baccbd55accf1d32f7680e6b9495936301 100644 (file)
--- a/obt/keyboard.c
+++ b/obt/keyboard.c
@@ -49,7 +49,7 @@ static gboolean hyper_l = FALSE;
 
 static gboolean started = FALSE;
 
-void obt_keyboard_reload()
+void obt_keyboard_reload(void)
 {
     gint i, j, k;
 
@@ -97,7 +97,7 @@ void obt_keyboard_reload()
     modkeys_keys[OBT_KEYBOARD_MODKEY_CONTROL] = ControlMask;
 }
 
-void obt_keyboard_shutdown()
+void obt_keyboard_shutdown(void)
 {
     XFreeModifiermap(modmap);
     modmap = NULL;
@@ -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')