xserver: Branch 'mpx'

[Peter Hutterer]

 autogen.sh   |    2 +-
 dix/events.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
diff-tree ffdf8f3e452638e6b050fccabee465d6c0300f45 (from 583e988b9f7cfb9293144c8309023c0dd1766715)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue Jul 10 13:56:38 2007 +0930

    DeliverEventsToWindow: ensure that genericMask has a defined value.

diff --git a/autogen.sh b/autogen.sh
index 66acd28..54e9f33 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode --disable-dmx --enable-kdrive "$@"
+$srcdir/configure --enable-maintainer-mode --disable-dmx --enable-dri --enable-kdrive "$@"
diff --git a/dix/events.c b/dix/events.c
index 097ebba..7de8d2e 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2020,9 +2020,8 @@ DeliverEventsToWindow(DeviceIntPtr pDev,
         /* get the XGE event mask. 
          * FIXME: needs to be freed somewhere too.
          */
-        if (!pWin->optional || !pWin->optional->geMasks)
-            tempGrab.genericMasks = NULL;
-        else
+        tempGrab.genericMasks = NULL;
+        if (pWin->optional && pWin->optional->geMasks)
         {
             GenericClientMasksPtr gemasks = pWin->optional->geMasks;
             GenericMaskPtr geclient = gemasks->geClients;