diff options
Diffstat (limited to 'xkbcomp/compat.c')
| -rwxr-xr-x[-rw-r--r--] | xkbcomp/compat.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 82fd4e666..f9402f129 100644..100755 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -114,7 +114,11 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) info->dflt.defs.fileID = info->fileID; info->dflt.defs.defined = 0; info->dflt.defs.merge = MergeOverride; + info->dflt.defs.next = NULL; info->dflt.interp.flags = 0; + info->dflt.interp.match = 0; + info->dflt.interp.mods = 0; + info->dflt.interp.sym = 0; info->dflt.interp.virtual_mod = XkbNoModifier; info->dflt.interp.act.type = XkbSA_NoAction; for (i = 0; i < XkbAnyActionDataSize; i++) @@ -655,14 +659,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; } |