dix: Ensure Proximity events don't kill the server.

Add Prox events to the if-clauses with the other events
that are usually sent from the input devices.
Ensure that the event deliverers won't try to deliver
events of type '0' (some extended events doesn't have
an equivalent core-type)

Small modification by Peter Hutterer.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>

1 files changed, 2 insertions, 1 deletions

diff --git a/mi/mieq.c b/mi/mieq.c
index a15b24f29..2759d165a 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -239,7 +239,8 @@ ChangeDeviceID(DeviceIntPtr dev, xEvent* event)
 
     if (type == DeviceKeyPress || type == DeviceKeyRelease ||
             type == DeviceButtonPress || type == DeviceButtonRelease ||
-            type == DeviceMotionNotify)
+            type == DeviceMotionNotify || type == ProximityIn ||
+            type == ProximityOut)
         ((deviceKeyButtonPointer*)event)->deviceid = dev->id;
     else if (type == DeviceValuator)
         ((deviceValuator*)event)->deviceid = dev->id;