xf86-video-ati: Branch 'master'

[Eamon Walsh]

 src/radeon_mergedfb.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

New commits:
diff-tree 81f3b4070b70483d6da4f7587e52a64ac69c8ca0 (from 48ff33a1770f3684cd50184db8f1944a456d9974)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Dec 18 14:06:15 2006 -0500

    Revert "Convert callers of LookupWindow() to dixLookupWindow()."
    
    This reverts commit 48ff33a1770f3684cd50184db8f1944a456d9974.

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 51b1720..820ba4b 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -1008,9 +1008,8 @@ RADEONProcXineramaGetState(ClientPtr cli
     register int		n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
-    if (n != Success)
-	return n;
+    pWin = LookupWindow(stuff->window, client);
+    if(!pWin) return BadWindow;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1034,9 +1033,8 @@ RADEONProcXineramaGetScreenCount(ClientP
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
-    if (n != Success)
-	return n;
+    pWin = LookupWindow(stuff->window, client);
+    if(!pWin) return BadWindow;
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1060,9 +1058,8 @@ RADEONProcXineramaGetScreenSize(ClientPt
     register int			n;
 
     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-    n = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
-    if (n != Success)
-	return n;
+    pWin = LookupWindow (stuff->window, client);
+    if(!pWin)  return BadWindow;
 
     rep.type = X_Reply;
     rep.length = 0;