xserver: Branch 'master'

[Adam Jackson]

 randr/rrproperty.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f
Author: Pierre Willenbrock <pierre at pirsoft.de>
Date:   Thu Oct 16 14:28:14 2008 -0400

    RANDR: Fix output property event delivery.

diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 2f1f8fb..9bc7254 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -44,7 +44,13 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
 	if (!(pRREvent->mask & RROutputPropertyNotifyMask))
 	    continue;
 
+	event->sequenceNumber = client->sequence;
 	event->window = pRREvent->window->drawable.id;
+	if (client->swapped) {
+	    int n;
+	    swaps(&event->sequenceNumber, n);
+	    swapl(&event->window, n);
+	}
 	WriteEventsToClient(pRREvent->client, 1, (xEvent *)event);
     }