xserver: Branch 'master'

[Aaron Plattner]

 randr/rrscreen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c18f454e4a9cab03e5d55b6d761a4a735c943b6b
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Feb 12 18:27:48 2009 -0800

    Query the DDX in ProcRRGetScreenInfo.
    
    This is the RandR 1.1 version of GetScreenResources and needs to re-query the
    DDX to see if the mode pool changed.
    
    Fixes Launchpad bug #325115.
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    (cherry picked from commit 660c2a7d4c6cb52fd0992e9d2008a24805dc8c02)

diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 590a388..94bf3ce 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -615,7 +615,7 @@ ProcRRGetScreenInfo (ClientPtr client)
     rep.pad = 0;
     
     if (pScrPriv)
-	if (!RRGetInfo (pScreen, FALSE))
+	if (!RRGetInfo (pScreen, TRUE))
 	    return BadAlloc;
 
     output = RRFirstOutput (pScreen);