xserver: Branch 'master'

[Jeremy Huddleston]

 miext/rootless/rootlessWindow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fc2d3cef8d7868b025aa14af7ed4b730e8f2c49
Author: Jeremy Huddleston <jeremy at tifa.local>
Date:   Mon Jan 28 12:18:43 2008 -0800

    Rootless: RootlessEnsureFrame: Added check for !IsRoot
    This was causing an issue with Apple-DRI and was reported here:
    http://trac.macosforge.org/projects/xquartz/ticket/51
    (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index b953398..7285f95 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -471,7 +471,7 @@ RootlessEnsureFrame(WindowPtr pWin)
     if (WINREC(pWin) != NULL)
         return WINREC(pWin);
 
-    if (!IsTopLevel(pWin))
+    if (!IsTopLevel(pWin) && !IsRoot(pWin))
         return NULL;
 
     if (pWin->drawable.class != InputOutput)