xserver: Branch 'server-1.2-branch'

[Alan Hourihane]

 hw/xwin/winmultiwindowwindow.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

New commits:
diff-tree 1587946f875f75f5324b35d0fc3f79a6e375bf7d (from a092419fe7a9f3c5602842d1aa98fa3c4089f058)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Dec 11 14:50:08 2006 +0000

    Fix Tooltip from minimized clients
    
    Bug #3678 (Colin Harrison)
    (cherry picked from 27d4b84f268ac21601f7f52a7e257f70753396b3 commit)

diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index dc8e38b..037c881 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -982,11 +982,10 @@ winAdjustXWindow (WindowPtr pWin, HWND h
       /*
        * If the Windows window is minimized, its WindowRect has
        * meaningless values so we don't adjust X window to it.
-       * Instead we put the X window to the bottom in Z order to
-       * be obscured by other windows.
        */
-      vlist[0] = Below;
-      return ConfigureWindow (pWin, CWStackMode, vlist, wClient(pWin));
+      vlist[0] = 0;
+      vlist[1] = 0;
+      return ConfigureWindow (pWin, CWX | CWY, vlist, wClient(pWin));
     }
   
   pDraw = &pWin->drawable;