From df9e5ae1cec973e076df62731e866fd28601ea1e Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 15 Jul 2002 03:11:11 +0000
Subject: [PATCH] Don't set FocusWindow Attrib. Fixes crash on XCloseDisplay

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14153 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                   | 5 ++---
 Source/x11/XGServer.m       | 4 ----
 Source/x11/XGServerWindow.m | 2 +-
 Source/x11/XIMInputServer.m | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d441ec..1c22af3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,7 @@
 2002-07-14  Adam Fedor  <fedor@gnu.org>
 
-	* Source/x11/XGServer.m ([XGServer -dealloc]): Don't close
-	the display (except when DEBUG), till we figure out why it
-	always crashes here.
+	* Source/x11/XIMInputServer.m (-ximCreateIC:): Don't set
+	FocusWindow attrib. Causes a segfault at XCloseDisplay..
 
 2002-07-13  Adam Fedor  <fedor@gnu.org>
 
diff --git a/Source/x11/XGServer.m b/Source/x11/XGServer.m
index be50b1b..439b302 100644
--- a/Source/x11/XGServer.m
+++ b/Source/x11/XGServer.m
@@ -420,11 +420,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
   DESTROY(inputServer);
   [self _destroyServerWindows];
   NSFreeMapTable(screenList);
-#ifdef DEBUG
-  /* FIXME: Avoid doing this until we figure out why we always
-     segfault here */
   XCloseDisplay(dpy);
-#endif
   [super dealloc];
 }
 
diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index 485f544..1cd55d2 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -2140,7 +2140,7 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
       NSDebugLLog(@"Focus", @"Setting focus to unknown win %d", win);
       return;
     }
-  
+
   NSDebugLLog(@"XGTrace", @"DPSsetinputfocus: %d", win);
   /*
    * If we have an outstanding request to set focus to this window,
diff --git a/Source/x11/XIMInputServer.m b/Source/x11/XIMInputServer.m
index ebe714d..15bd9bf 100644
--- a/Source/x11/XIMInputServer.m
+++ b/Source/x11/XIMInputServer.m
@@ -313,7 +313,7 @@
 {
   XIC xic;
   xic = XCreateIC(xim, XNClientWindow, w, XNInputStyle,
-		  xim_style, XNFocusWindow, w, NULL);
+		  xim_style, NULL);
   if (xic==NULL)
     NSDebugLLog(@"XIM", @"Can't create the input context.\n");
   return xic;