xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 config/dbus.c |    2 +-
 dix/devices.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9390b7a133b0e17bc4d303effb7a99ff7017b086
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Jun 7 19:26:45 2009 +1000

    dix: protect against missing ButtonClasses in GetPointerMapping.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/devices.c b/dix/devices.c
index eb54e0a..3996ca6 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1724,10 +1724,11 @@ ProcGetPointerMapping(ClientPtr client)
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.nElts = butc->numButtons;
+    rep.nElts = (butc) ? butc->numButtons : 0;
     rep.length = ((unsigned)rep.nElts + (4-1))/4;
     WriteReplyToClient(client, sizeof(xGetPointerMappingReply), &rep);
-    (void)WriteToClient(client, (int)rep.nElts, (char *)&butc->map[1]);
+    if (butc)
+        WriteToClient(client, (int)rep.nElts, (char *)&butc->map[1]);
     return Success;
 }
 
commit 21ee53060b4dcb5c12074cf6682ff0067021ff60
Author: Simon Thum <simon.thum at gmx.de>
Date:   Fri Jun 5 19:14:48 2009 +0200

    config: fix build after XI2 API changes to RemoveDevice.
    
    This patch fixes the build with --enable-config-dbus is enabled
    (default disabled).
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/config/dbus.c b/config/dbus.c
index cef8ed5..37462ac 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -175,7 +175,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
 unwind:
     if (ret != Success) {
         if (dev)
-            RemoveDevice(dev);
+            RemoveDevice(dev, TRUE);
 
         err = -ret;
         dbus_message_iter_append_basic(&reply_iter, DBUS_TYPE_INT32, &err);