Merge commit '20081002' into HEAD

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

diff --git a/ioncore/conf-bindings.c b/ioncore/conf-bindings.c
index d0d2fba8ea569afb21e65c671dba91a5619023c1..69d8996fac812e45cff7eb21fd86239dff611efd 100644 (file)
--- a/ioncore/conf-bindings.c
+++ b/ioncore/conf-bindings.c
@@ -20,6 +20,7 @@
 #include <libextl/extl.h>
 #include "conf-bindings.h"
 #include "bindmaps.h"
 #include <libextl/extl.h>
 #include "conf-bindings.h"
 #include "bindmaps.h"

+#include "ioncore.h"

 
 
 /*{{{ parse_keybut */
 
 
 /*{{{ 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){
                 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;
                 break;
             }
             *ksb_ret=keysym;