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

[Adam Jackson]

 composite/compext.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree a092419fe7a9f3c5602842d1aa98fa3c4089f058 (from d1e8b7c4a4dcbeefbe93fe0de0270593a8d80b94)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Dec 5 13:44:05 2006 -0800

    Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
    (cherry picked from 724f9cb578086e8483a2d0636dd6eb05d664d31c commit)

diff --git a/composite/compext.c b/composite/compext.c
index ec5e1fa..13936fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -270,7 +270,7 @@ ProcCompositeNameWindowPixmap (ClientPtr
 	return BadWindow;
     }
 
-    if (!pWin->realized)
+    if (!pWin->viewable)
 	return BadMatch;
 
     LEGAL_NEW_RESOURCE (stuff->pixmap, client);
diff-tree d1e8b7c4a4dcbeefbe93fe0de0270593a8d80b94 (from 2cba9a4f1caf32a2ee41fd8811e8e0e802610985)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Dec 5 12:42:12 2006 -0800

    Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
    
    Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
    if !pWin->realized.
    (cherry picked from 3690de9b1b0902d395bc7d071fc05ebc8f75be2b commit)

diff --git a/composite/compext.c b/composite/compext.c
index a7ad4e2..ec5e1fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -269,7 +269,10 @@ ProcCompositeNameWindowPixmap (ClientPtr
 	client->errorValue = stuff->window;
 	return BadWindow;
     }
-    
+
+    if (!pWin->realized)
+	return BadMatch;
+
     LEGAL_NEW_RESOURCE (stuff->pixmap, client);
     
     cw = GetCompWindow (pWin);