From 1230c55ac3f75f4902b51b223d40354a54d0d0ab Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu, 30 Jun 2005 18:50:20 +0000
Subject: [PATCH] =?UTF-8?q?Pass=20serverClient=20instead=20of=20NULL=20to?=
 =?UTF-8?q?=20ConfigureWindow.=20This=20should=20fix=20a=20=20=20=20=20cra?=
 =?UTF-8?q?sh=20reported=20by=20=C3=98yvind=20Harboe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw/xwin/ChangeLog               | 6 ++++++
 hw/xwin/winmultiwindowwndproc.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 82a656021..993313fa0 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* winmultiwindowwndproc.c:
+	Pass serverClient instead of NULL to ConfigureWindow.
+	This should fix a crash reported by Øyvind Harboe
+
 2005-06-08  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winlayouts.h:
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 93ddcd4b3..b4f53dc2e 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -277,7 +277,7 @@ static void winRaiseWindow(WindowPtr pWin)
      * in time
      */
     XID vlist[1] = { 0 };
-    ConfigureWindow(pWin, CWStackMode, vlist, NULL); 
+    ConfigureWindow(pWin, CWStackMode, vlist, serverClient); 
     winInRaiseWindow = oldstate;
   }
 }