Imported Upstream version 20090110

[ion3.git] / ioncore / conf-bindings.c

diff --git a/ioncore/conf-bindings.c b/ioncore/conf-bindings.c
index c449a87cdbf740f3e4a69e1b80cca6dd9810d8ab..154d94bf1e2b9c39656f96351487e437863d8cdc 100644 (file)
--- a/ioncore/conf-bindings.c
+++ b/ioncore/conf-bindings.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/conf-bindings.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -20,6 +20,7 @@
 #include <libextl/extl.h>
 #include "conf-bindings.h"
 #include "bindmaps.h"
+#include "ioncore.h"
 
 
 /*{{{ parse_keybut */
@@ -94,7 +95,8 @@ bool ioncore_parse_keybut(const char *str, uint *mod_ret, uint *ksb_ret,
                 break;
             }
             if(XKeysymToKeycode(ioncore_g.dpy, keysym)==0){
-                warn_obj(str, TR("Could not convert keysym to keycode."));
+                ioncore_warn_nolog("%s: %s", str, 
+                                   TR("Could not convert keysym to keycode."));
                 break;
             }
             *ksb_ret=keysym;
@@ -185,7 +187,7 @@ static bool do_action(WBindmap *bindmap, const char *str,
         binding.func=func;
         if(bindmap_remove_binding(bindmap, &binding))
             return TRUE;
-        warn(TR("Unable to remove binding %s."), str);
+        /*warn(TR("Unable to remove binding %s."), str);*/
     }
 
     return FALSE;