prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / plugins / keyboard / translate.c

diff --git a/plugins/keyboard/translate.c b/plugins/keyboard/translate.c
index d1fdc58d2eaa7e9b125df6b51aebf6e4eb8ab590..05887e6bb706cee0a64889d09a474de4adb7500c 100644 (file)
--- a/plugins/keyboard/translate.c
+++ b/plugins/keyboard/translate.c
@@ -1,4 +1,4 @@
-#include "../../kernel/openbox.h"
+#include "kernel/openbox.h"
 #include <glib.h>
 #include <string.h>
 
@@ -15,7 +15,7 @@ static guint translate_modifier(char *str)
              !g_ascii_strcasecmp("C", str)) return ControlMask;
     else if (!g_ascii_strcasecmp("Shift", str) ||
              !g_ascii_strcasecmp("S", str)) return ShiftMask;
-    g_warning("Invalid modifier '%s' in binding.", str);
+    g_message("Invalid modifier '%s' in binding.", str);
     return 0;
 }
 
@@ -47,12 +47,12 @@ gboolean translate_key(char *str, guint *state, guint *keycode)
     /* figure out the keycode */
     sym = XStringToKeysym(l);
     if (sym == NoSymbol) {
-       g_warning("Invalid key name '%s' in key binding.", l);
+       g_message("Invalid key name '%s' in key binding.", l);
        goto translation_fail;
     }
     *keycode = XKeysymToKeycode(ob_display, sym);
-    if (!keycode) {
-       g_warning("Key '%s' does not exist on the display.", l); 
+    if (!*keycode) {
+       g_message("Key '%s' does not exist on the display.", l); 
        goto translation_fail;
     }