1 Wed Jul 23 18:30:48 BST 2008 Tuomo Valkonen <tuomov@iki.fi>
2 * Do not log complaints about keysym to keycode conversion failure.
3 diff -rN -u old-ion-3plus/ioncore/conf-bindings.c new-ion-3plus/ioncore/conf-bindings.c
4 --- old-ion-3plus/ioncore/conf-bindings.c 2008-07-24 21:29:07.000000000 +0100
5 +++ new-ion-3plus/ioncore/conf-bindings.c 2008-07-24 21:29:07.000000000 +0100
7 #include <libextl/extl.h>
8 #include "conf-bindings.h"
17 if(XKeysymToKeycode(ioncore_g.dpy, keysym)==0){
18 - warn_obj(str, TR("Could not convert keysym to keycode."));
19 + ioncore_warn_nolog("%s: %s", str,
20 + TR("Could not convert keysym to keycode."));
24 diff -rN -u old-ion-3plus/ioncore/ioncore.c new-ion-3plus/ioncore/ioncore.c
25 --- old-ion-3plus/ioncore/ioncore.c 2008-07-24 21:29:07.000000000 +0100
26 +++ new-ion-3plus/ioncore/ioncore.c 2008-07-24 21:29:07.000000000 +0100
33 #include <libtu/util.h>
34 #include <libtu/optparser.h>
39 -void ioncore_warn_nolog(const char *str)
40 +void ioncore_warn_nolog(const char *str, ...)
42 - fprintf(stderr, "%s: %s\n", libtu_progname(), str);
45 + va_start(args, str);
46 + fprintf(stderr, "%s: ", libtu_progname());
47 + vfprintf(stderr, str, args);
48 + fprintf(stderr, "\n");
56 diff -rN -u old-ion-3plus/ioncore/ioncore.h new-ion-3plus/ioncore/ioncore.h
57 --- old-ion-3plus/ioncore/ioncore.h 2008-07-24 21:29:07.000000000 +0100
58 +++ new-ion-3plus/ioncore/ioncore.h 2008-07-24 21:29:07.000000000 +0100
60 extern WHook *ioncore_snapshot_hook;
61 extern WHook *ioncore_deinit_hook;
63 -extern void ioncore_warn_nolog(const char *str);
64 +extern void ioncore_warn_nolog(const char *str, ...);
66 #endif /* ION_IONCORE_IONCORE_H */