From 4466b21bccaf576efd87ae1952005a07a6685c80 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 16 Oct 2001 21:45:28 +0000
Subject: 	* generic/tkWindow.c (OpenIM): Added simple XIM patch to
 enable 	basic XIM input on Unix. [Patch #412727] (fabian)

---
 ChangeLog          | 5 +++++
 generic/tkWindow.c | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2e78081..5532cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-16  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* generic/tkWindow.c (OpenIM): Added simple XIM patch to enable
+	basic XIM input on Unix. [Patch #412727] (fabian)
+
 2001-10-15  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/configure:
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index c9481c5..ae02e35 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.39 2001/09/26 21:36:19 pspjuth Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.40 2001/10/16 21:45:28 hobbs Exp $
  */
 
 #include "tkPort.h"
@@ -2571,6 +2571,11 @@ OpenIM(dispPtr)
 #else
     unsigned short i;
     XIMStyles *stylePtr;
+    char *modifier_list;
+
+    if ((modifier_list = XSetLocaleModifiers("")) == NULL) {
+	goto error;
+    }
 
     dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL);
     if (dispPtr->inputMethod == NULL) {
-- 
cgit v0.12