xserver: Branch 'server-1.6-branch'

[Keith Packard]

 Xext/mbuf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e40841ce5afa0678b74b9eff37c7d304758309b6
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date:   Tue Dec 2 09:01:56 2008 +1000

    Xext: fix MultiBuffer compilation error with TryClientEvents. (#18835)
    
    X.Org Bug 18835 <http://bugs.freedesktop.org/show_bug.cgi?id=18835>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
    (cherry picked from commit 1dfed222e93f4684c2a450944a9a0ea9e085c43f)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index a23a4fa..39b8ba1 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -1314,7 +1314,7 @@ DeliverEventsToMultibuffer (pMultibuffer, pEvents, count, filter)
 
     /* maybe send event to owner */
     if ((attempt = TryClientEvents(
-	bClient(pMultibuffer), pEvents, count, pMultibuffer->eventMask, filter, (GrabPtr) 0)) != 0)
+	bClient(pMultibuffer), NULL, pEvents, count, pMultibuffer->eventMask, filter, (GrabPtr) 0)) != 0)
     {
 	if (attempt > 0)
 	    deliveries++;
@@ -1326,7 +1326,7 @@ DeliverEventsToMultibuffer (pMultibuffer, pEvents, count, filter)
     for (other = pMultibuffer->otherClients; other; other=other->next)
     {
 	if ((attempt = TryClientEvents(
-	      rClient(other), pEvents, count, other->mask, filter, (GrabPtr) 0)) != 0)
+	      rClient(other), NULL, pEvents, count, other->mask, filter, (GrabPtr) 0)) != 0)
 	{
 	    if (attempt > 0)
 		deliveries++;