Merge branch 'master' into mpx

Conflicts: Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
parent 210eeef495 e915a26397
commit 0ac1755977
44 changed files with 492 additions and 454 deletions
--- a/dix/window.c
+++ b/dix/window.c
@@ -3043,7 +3043,8 @@ UnrealizeTree(
 	    } 
 #endif
 	    (* Unrealize)(pChild);
-	    DeleteWindowFromAnyEvents(pChild, FALSE);
+	    if (MapUnmapEventsEnabled(pWin))
+		DeleteWindowFromAnyEvents(pChild, FALSE);
 	    if (pChild->viewable)
 	    {
 #ifdef DO_SAVE_UNDERS