diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-31 08:37:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-31 08:37:31 +0100 |
| commit | 2a10674ff619f042c580e69e7160d834903b4273 (patch) | |
| tree | 70021ac64c7b0bed2354bbc1908e881c3f9adede | |
| parent | 5bda4b6582522d21b15d62c5c76c71104e924cbc (diff) | |
| download | vcxsrv-2a10674ff619f042c580e69e7160d834903b4273.tar.gz vcxsrv-2a10674ff619f042c580e69e7160d834903b4273.tar.bz2 vcxsrv-2a10674ff619f042c580e69e7160d834903b4273.zip | |
Converted error message which wasn't realy an error message to a warning
Also print the symbol name in the warning message
| -rw-r--r-- | xkbcomp/compat.c | 5 | ||||
| -rw-r--r-- | xkbcomp/parseutils.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 2b0014244..526224da1 100644 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -655,14 +655,13 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, if (!ResolveStateAndPredicate(def->match, &pred, &mods, info)) { - ERROR("Couldn't determine matching modifiers\n"); + if (warningLevel > 0) + WARN1("Couldn't determine matching modifiers\n"); ACTION("Symbol interpretation ignored\n"); return True; } if (def->ignore) { - ERROR("Couldn't lookup keysym\n"); - ACTION("Symbol interpretation ignored\n"); return True; } diff --git a/xkbcomp/parseutils.c b/xkbcomp/parseutils.c index 253cd9dae..025e1ef3f 100644 --- a/xkbcomp/parseutils.c +++ b/xkbcomp/parseutils.c @@ -230,7 +230,12 @@ InterpCreate(const char *sym_str, ExprDef * match) def->common.stmtType = StmtInterpDef; def->common.next = NULL; if (LookupKeysym(sym_str, &def->sym) == 0) + { def->ignore = True; + if (warningLevel > 0) + WARN1("Couldn't lookup keysym %s\n", sym_str); + ACTION("Symbol interpretation ignored\n"); + } else def->ignore = False; def->match = match; |