[PATCH xserver 6/7] dix: Switch window unmap to mark normally instead of UnmapValData

[Adam Jackson]

---
 dix/window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index 55290577d9..34bed93d93 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2870,7 +2870,7 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure)
     if (SubStrSend(pWin, pParent))
         DeliverUnmapNotify(pWin, fromConfigure);
     if (wasPaintable && !fromConfigure) {
-        pWin->valdata = UnmapValData;
+        (*pScreen->MarkWindow) (pWin);
         (*pScreen->MarkOverlappedWindows) (pWin, pWin->nextSib, &pLayerWin);
         (*pScreen->MarkWindow) (pLayerWin->parent);
     }
@@ -2920,7 +2920,7 @@ UnmapSubwindows(WindowPtr pWin)
             if (parentNotify || StrSend(pChild))
                 DeliverUnmapNotify(pChild, xFalse);
             if (pChild->viewable) {
-                pChild->valdata = UnmapValData;
+                (*pScreen->MarkWindow) (pChild);
                 anyMarked = TRUE;
             }
             pChild->mapped = FALSE;
-- 
2.17.0