From f6f3322fc7562dbfccaf798b05d42ea222860ba8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 21 Jun 2007 18:16:21 +0930
Subject: [PATCH] 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.
---
 xkb/xkbActions.c | 3 +--
 1 file changed, 1 insertion(+), 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);