[PATCH] 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 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index cff341b..ec29555 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1577,20 +1577,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;
 }
-- 
1.8.3.1