xserver: Branch 'server-1.5-branch'

[Peter Hutterer]

 xkb/xkbAccessX.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ff1a9b7fea2cfe00bc02a99b919fa1178d4f0b12
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jul 23 16:53:59 2008 +0930

    xkb: don't send core events for extension devices on SlowKey timeout.
    
    RedHat Bug 448604 <https://bugzilla.redhat.com/show_bug.cgi?id=448604>

diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 75b8c5a..89be839 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -352,7 +352,9 @@ XkbControlsPtr	ctrls;
 	XkbSendAccessXNotify(keybd,&ev);
 	if (XkbAX_NeedFeedback(ctrls,XkbAX_SKAcceptFBMask))
 	    XkbDDXAccessXBeep(keybd,_BEEP_SLOW_ACCEPT,XkbSlowKeysMask);
-	AccessXKeyboardEvent(keybd,KeyPress,xkbi->slowKey,False);
+	AccessXKeyboardEvent(keybd,
+                (keybd == inputInfo.keyboard) ?  KeyPress : DeviceKeyPress,
+                xkbi->slowKey,False);
 	/* check for magic sequences */
 	if ((ctrls->enabled_ctrls&XkbAccessXKeysMask) &&
 	    ((sym[0]==XK_Shift_R)||(sym[0]==XK_Shift_L)))