xserver: Branch 'master'

[Dave Airlie]

 randr/rrcrtc.c   |    2 --
 randr/rroutput.c |   10 ----------
 2 files changed, 12 deletions(-)

New commits:
diff-tree 96b497f4a370c32df916aaf143de1577166c775b (from 5a7a5fe6fa53196c424031256d4624df0f9d9432)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 18 16:31:51 2007 +1100

    Revert "Correct ref counting of RRMode structures"
    
    This reverts commit 49bf6e0715a39be179fd826e6e951d473a5facdd.
    
    Revert this as we were missing another patch on master that this needs

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index f5ecc7d..db506f4 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -361,8 +361,6 @@ RRCrtcDestroyResource (pointer value, XI
     }
     if (crtc->gammaRed)
 	xfree (crtc->gammaRed);
-    if (crtc->mode)
-	RRModeDestroy (crtc->mode);
     xfree (crtc);
     return 1;
 }
diff --git a/randr/rroutput.c b/randr/rroutput.c
index 88606c9..df1741f 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -336,17 +336,7 @@ RROutputDestroyResource (pointer value, 
 	}
     }
     if (output->modes)
-    {
-	for (m = 0; m < output->numModes; m++)
-	    RRModeDestroy (output->modes[m]);
 	xfree (output->modes);
-    }
-    
-    for (m = 0; m < output->numUserModes; m++)
-	RRModeDestroy (output->userModes[m]);
-    if (output->userModes)
-	xfree (output->userModes);
-
     if (output->crtcs)
 	xfree (output->crtcs);
     if (output->clones)