xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 dix/getevents.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b8cc3acdac7e3afe7f58bce51229e0664c2f7f6e
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 15 21:58:24 2008 -0800

    dix: Fix some sanity in getevents.c

diff --git a/dix/getevents.c b/dix/getevents.c
index 61d727b..a96aa0a 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -407,7 +407,7 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
                           int num_valuators, int *valuators) {
     int numEvents = 0;
     CARD32 ms = 0;
-    KeySym *map = pDev->key->curKeySyms.map;
+    KeySym *map;
     KeySym sym;
     deviceKeyButtonPointer *kbp = NULL;
 
@@ -426,8 +426,6 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
         return 0;
     
     map = pDev->key->curKeySyms.map;
-    sym = map[key_code * pDev->key->curKeySyms.mapWidth];
-
     sym = map[(key_code - pDev->key->curKeySyms.minKeyCode)
               * pDev->key->curKeySyms.mapWidth];