summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2023-08-26 08:42:41 (GMT)
committerfvogel <fvogelnew1@free.fr>2023-08-26 08:42:41 (GMT)
commite28f8c1f992fb082fd50e6ec60dd53e7d8655514 (patch)
tree640d4186dbee9740b7e13ba8f4a2df3aa8afdf83 /unix
parent042a99280ea10e5461012d9665210544ff4a7989 (diff)
downloadtk-e28f8c1f992fb082fd50e6ec60dd53e7d8655514.zip
tk-e28f8c1f992fb082fd50e6ec60dd53e7d8655514.tar.gz
tk-e28f8c1f992fb082fd50e6ec60dd53e7d8655514.tar.bz2
Make it build, and make it a better fix (no leak).
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixEvent.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index fc6d699..5e8cf7c 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -175,14 +175,16 @@ TkpOpenDisplay(
if (display == NULL) {
return NULL;
}
+#ifdef TK_USE_INPUT_METHODS
+ if (XSetLocaleModifiers("") == NULL) {
+ return NULL;
+ }
+#endif
dispPtr = ckalloc(sizeof(TkDisplay));
memset(dispPtr, 0, sizeof(TkDisplay));
dispPtr->display = display;
dispPtr->flags |= use_xkb;
#ifdef TK_USE_INPUT_METHODS
- if (XSetLocaleModifiers("") == NULL) {
- return;
- }
OpenIM(dispPtr);
XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL,
InstantiateIMCallback, (XPointer) dispPtr);