xserver: Branch 'master'

[Matthew Allum]

 hw/kdrive/ephyr/hostx.c |    6 ------
 1 files changed, 6 deletions(-)

New commits:
diff-tree 39169fd373b97f34923f6494d697d9429d0b8aa3 (from b74c845a1233f78b841ff8840272c50873300c20)
Author: Matthew Allum <mallum at polystyrene.(none)>
Date:   Tue Aug 1 13:39:22 2006 +0100

    Back out 'mystery' spurious host window hints.

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 32a46dc..d0a2f2f 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -533,15 +533,9 @@ hostx_screen_init (int width, int height
 
   /* Ask the WM to keep our size static */
   size_hints = XAllocSizeHints();
-#if 0
   size_hints->max_width = size_hints->min_width = width;
   size_hints->max_height = size_hints->min_height = height;
   size_hints->flags = PMinSize|PMaxSize;
-#else
-  size_hints->min_width = 100;
-  size_hints->min_height = 100;
-  size_hints->flags = PMinSize;
-#endif
   XSetWMNormalHints(HostX.dpy, HostX.win, size_hints);
   XFree(size_hints);