X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=71164ac34d2aa122eb613e31a37b1d33d3f4ba79;hb=141c249b8cd3b94a722acc8c0225b3cbf83e5042;hp=ba4559551a3e00c127a2ec793e796e5e0bd42df4;hpb=27773e1cb7492de080bd19189b4fcd2a6b9a0e9e;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index ba455955..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 @@ -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; } @@ -164,10 +165,8 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client, g_assert(action->data.any.interactive); if (!interactive_states) { - if (!grab_keyboard(TRUE)) { - ob_debug("grab KEYBOARD failed\n"); + if (!grab_keyboard(TRUE)) return FALSE; - } } s = g_new(ObInteractiveState, 1);