summaryrefslogtreecommitdiffstats
path: root/generic/tkWindow.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-02-10 11:39:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-02-10 11:39:44 (GMT)
commit1bb90bc92b7d37d60d72df7ca8b3292b915ebd68 (patch)
tree5dba104bf29ccd9db2e05bec03d59c9cb9b31ac3 /generic/tkWindow.c
parent5d06269146b5f47ce438598896d0e83e573365b6 (diff)
parent139ab296ac6361ac60fa9b31339936ee819a0359 (diff)
downloadtk-1bb90bc92b7d37d60d72df7ca8b3292b915ebd68.zip
tk-1bb90bc92b7d37d60d72df7ca8b3292b915ebd68.tar.gz
tk-1bb90bc92b7d37d60d72df7ca8b3292b915ebd68.tar.bz2
Fix [7d967c68a09e07e355358af40f36dd5dd84c7022|7d967c68a0] follow-up: Tk applications segmentation fault when ibus-daemon IME is restarted. Patch by Brad Lanam.
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r--generic/tkWindow.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 9a31365..ed57280 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -475,9 +475,6 @@ GetScreen(
dispPtr->cursorFont = None;
dispPtr->warpWindow = NULL;
dispPtr->multipleAtom = None;
-#ifdef TK_USE_INPUT_METHODS
- dispPtr->ximGeneration = 0;
-#endif /*TK_USE_INPUT_METHODS*/
/*
* By default we do want to collapse motion events in
@@ -656,6 +653,7 @@ TkAllocWindow(
winPtr->flags = 0;
winPtr->handlerList = NULL;
#ifdef TK_USE_INPUT_METHODS
+ winPtr->ximGeneration = 0;
winPtr->inputContext = NULL;
#endif /* TK_USE_INPUT_METHODS */
winPtr->tagPtr = NULL;