[PATCH 7/7] dix: Unconditionally do ->RestackWindow in MoveWindowInStack

[Adam Jackson]

Only rootless ddxes fill that slot in anyway.  So just do it, and remove
a #ifdef ROOTLESS in the process.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 dix/window.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index ff5d274..d932bb8 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1574,20 +1574,16 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
                     pFirstChange = pFirstChange->nextSib;
             }
         }
-        if (pWin->drawable.pScreen->RestackWindow)
-            (*pWin->drawable.pScreen->RestackWindow) (pWin, pOldNextSib);
     }
 
-#ifdef ROOTLESS
     /*
      * In rootless mode we can't optimize away window restacks.
      * There may be non-X windows around, so even if the window
      * is in the correct position from X's point of view,
      * the underlying window system may want to reorder it.
      */
-    else if (pWin->drawable.pScreen->RestackWindow)
+    if (pWin->drawable.pScreen->RestackWindow)
         (*pWin->drawable.pScreen->RestackWindow) (pWin, pWin->nextSib);
-#endif
 
     return pFirstChange;
 }
@@ -2234,11 +2230,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
     if ((mask & CWBorderWidth) && (bw != wBorderWidth(pWin)))
         goto ActuallyDoSomething;
     if (mask & CWStackMode) {
-#ifndef ROOTLESS
-        /* See above for why we always reorder in rootless mode. */
-        if (pWin->nextSib != pSib)
-#endif
-            goto ActuallyDoSomething;
+        goto ActuallyDoSomething;
     }
     return Success;
 
-- 
1.8.3.1