diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-08-29 19:25:45 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-08-29 19:25:45 (GMT) |
| commit | 2328cbba3ccac41592ea8179c130f81f362db3aa (patch) | |
| tree | d1c88c1785d2a6d6411f9ed93d4148fd5220b0cf /unix | |
| parent | cad6b9f17cdf949785417b916441951939ef6818 (diff) | |
| parent | eae2af7661e0455d2275e86afac7f8c9de564837 (diff) | |
| download | tk-2328cbba3ccac41592ea8179c130f81f362db3aa.zip tk-2328cbba3ccac41592ea8179c130f81f362db3aa.tar.gz tk-2328cbba3ccac41592ea8179c130f81f362db3aa.tar.bz2 | |
Fix [e42eef33ee]: valgrind complains at wish startup (input methods). Patch from John Goodward.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixEvent.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 67ce552..e289962 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -167,6 +167,7 @@ TkpOpenDisplay( memset(dispPtr, 0, sizeof(TkDisplay)); dispPtr->display = display; #ifdef TK_USE_INPUT_METHODS + XSetLocaleModifiers(""); OpenIM(dispPtr); XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL, InstantiateIMCallback, (XPointer) dispPtr); @@ -738,10 +739,6 @@ OpenIM( XIMStyles *stylePtr; XIMStyle bestStyle = 0; - if (XSetLocaleModifiers("") == NULL) { - return; - } - ++dispPtr->ximGeneration; dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL); if (dispPtr->inputMethod == NULL) { |