summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-06-21 18:16:21 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-06-21 18:16:21 +0930
commitf6f3322fc7562dbfccaf798b05d42ea222860ba8 (patch)
tree5fc33b00edbba417d218185a742b5671ac645a03
parent8431f6083076cf1e701366767d8f8d32a628200f (diff)
Revert "Save processInputProc before wrapping it and restore it later, instead of"
Mixed up source trees, this was a very bad fix. This reverts commit 8431f6083076cf1e701366767d8f8d32a628200f.
-rw-r--r--xkb/xkbActions.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 156fb2649..4c3efe28d 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1300,8 +1300,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
UNWRAP_PROCESS_INPUT_PROC(dev,xkbPrivPtr);
dev->public.processInputProc(xE,dev,count);
COND_WRAP_PROCESS_INPUT_PROC(dev, xkbPrivPtr,
- (dev == inputInfo.keyboard) ? ProcessKeyboardEvent : ProcessOtherEvent,
- xkbUnwrapProc);
+ ProcessKeyboardEvent,xkbUnwrapProc);
keyc->modifierMap[key] = realMods;
}
else CoreProcessPointerEvent(xE,dev,count);