xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 Xext/security.c |    2 +-
 mi/mieq.c       |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 9965174f4f09a7de00a9569607e96226208bc2ce
Author: Pierre Willenbrock <pierre at pirsoft.de>
Date:   Thu Jul 16 12:12:48 2009 +0200

    Check dev->u.master if there is a custom event handler, too
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/mi/mieq.c b/mi/mieq.c
index 5625802..f28a16d 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -401,7 +401,9 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
         if (handler)
         {
             handler(DequeueScreen(dev)->myNum, event, dev);
-            if (master)
+            /* Check for the SD's master in case the device got detached
+             * during event processing */
+            if (master && dev->u.master)
                 handler(DequeueScreen(master)->myNum,
                         (InternalEvent*)masterEvents->event, master);
         } else
commit c806162c133603a99d9cd844bb04485bb663707d
Author: Pierre Willenbrock <pierre at pirsoft.de>
Date:   Tue Jul 14 13:42:19 2009 +0200

    Always update u.lastSlave
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/mi/mieq.c b/mi/mieq.c
index f9ceab2..5625802 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -393,17 +393,17 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
     else {
         master = CopyGetMasterEvent(dev, event, masterEvents);
 
+        if (master)
+            master->u.lastSlave = dev;
+
         /* If someone's registered a custom event handler, let them
          * steal it. */
         if (handler)
         {
             handler(DequeueScreen(dev)->myNum, event, dev);
             if (master)
-            {
-                master->u.lastSlave = dev;
                 handler(DequeueScreen(master)->myNum,
                         (InternalEvent*)masterEvents->event, master);
-            }
         } else
         {
             /* process slave first, then master */
commit 4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jul 17 10:40:59 2009 +1000

    Xext: include securproto.h instead of securstr.h
    
    Reported-by: Byeong-ryeol Kim
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xext/security.c b/Xext/security.c
index 8b72e17..42eb9f0 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securstr.h>
+#include <X11/extensions/securproto.h>
 #include "modinit.h"
 
 /* Extension stuff */