M plugins/keyboard/keyboard.c → plugins/keyboard/keyboard.c

@@ -16,7 +16,7 @@ {
     parse_reg_section("keyboard", keyparse);
 }
 
-KeyBindingTree *firstnode;
+KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state;
@@ -58,12 +58,12 @@ if (!(tree = tree_build(keylist)))
         return FALSE;
     if ((t = tree_find(tree, &conflict)) != NULL) {
 	/* already bound to something */
-	g_warning("keychain is already bound");
+	g_message("keychain is already bound");
         tree_destroy(tree);
         return FALSE;
     }
     if (conflict) {
-        g_warning("conflict with binding");
+        g_message("conflict with binding");
         tree_destroy(tree);
         return FALSE;
     }
@@ -130,6 +130,9 @@ }
 
 void plugin_startup()
 {
+    curpos = NULL;
+    grabbed = FALSE;
+
     dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
 
     translate_key("C-g", &reset_state, &reset_key);

M plugins/keyboard/translate.c → plugins/keyboard/translate.c

@@ -15,7 +15,7 @@ else if (!g_ascii_strcasecmp("Control", 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 @@ 
     /* 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); 
+	g_message("Key '%s' does not exist on the display.", l); 
 	goto translation_fail;
     }