X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=71164ac34d2aa122eb613e31a37b1d33d3f4ba79;hb=141c249b8cd3b94a722acc8c0225b3cbf83e5042;hp=b95b0805b00083cbb9a6ed57cea46cdf11b9f6c4;hpb=19b480058e869a588ea20be5e29017ae2052e967;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index b95b0805..71164ac3 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -2,7 +2,7 @@
 
    keyboard.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 #include "keyboard.h"
 #include "translate.h"
 #include "moveresize.h"
+#include "gettext.h"
 
 #include <glib.h>
 
@@ -127,7 +128,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
         t = tree;
 
     if (conflict) {
-        g_warning("conflict with binding");
+        g_message(_("Conflict with key binding in config file"));
         tree_destroy(tree);
         return FALSE;
     }
@@ -166,10 +167,6 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client,
     if (!interactive_states) {
         if (!grab_keyboard(TRUE))
             return FALSE;
-        if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
-            grab_keyboard(FALSE);
-            return FALSE;
-        }
     }
 
     s = g_new(ObInteractiveState, 1);
@@ -195,7 +192,6 @@ void keyboard_interactive_end(ObInteractiveState *s,
 
     if (!interactive_states) {
         grab_keyboard(FALSE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
         keyboard_reset_chains();
     }
 }
@@ -271,7 +267,8 @@ void keyboard_event(ObClient *client, const XEvent *e)
                 ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
                 /* 5 second timeout for chains */
                 ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
-                                         chain_timeout, NULL, NULL);
+                                         chain_timeout, NULL,
+                                         g_direct_equal, NULL);
                 grab_keys(FALSE);
                 curpos = p;
                 grab_keys(TRUE);