xserver: Branch 'server-1.12-branch' - 2 commits

[Jeremy Huddleston]

 randr/rroutput.c |    1 +
 randr/rrscreen.c |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 18863154bdb0f4ff79b2c79eae73ddd7a6ddc764
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 9 19:12:42 2012 -0700

    ProcRRGetScreenInfo: swap configTimestamp as well
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Tested-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 15bc13c8d088e05f14c7262348e0066929c29251)

diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index c564d1f..a9c3f61 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -685,6 +685,7 @@ ProcRRGetScreenInfo(ClientPtr client)
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
         swapl(&rep.timestamp);
+        swapl(&rep.configTimestamp);
         swaps(&rep.rotation);
         swaps(&rep.nSizes);
         swaps(&rep.sizeID);
commit abffc882af655d2c8434e6eb7374dda472d6a8b0
Author: Jaroslav Šmíd <jardasmid at gmail.com>
Date:   Mon Jul 9 19:12:42 2012 -0700

    Bug 51375: Xorg doesn't set status for RRGetOutputInfo
    
    https://bugs.freedesktop.org/show_bug.cgi?id=51375
    https://bugs.freedesktop.org/attachment.cgi?id=63397
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Tested-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 3a013b8816bc0bb765c99e8a2bf2ea536dc62c3b)

diff --git a/randr/rroutput.c b/randr/rroutput.c
index fbd0e32..cd6b365 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -426,6 +426,7 @@ ProcRRGetOutputInfo(ClientPtr client)
     pScrPriv = rrGetScrPriv(pScreen);
 
     rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
     rep.sequenceNumber = client->sequence;
     rep.length = bytes_to_int32(OutputInfoExtra);
     rep.timestamp = pScrPriv->lastSetTime.milliseconds;