summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-02-10 11:38:55 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-02-10 11:38:55 (GMT)
commit1a74e9de135efaea49d48f7974960bc6e8426949 (patch)
treed07b82b8023dd235420cd0801f55f10938152889
parent334a0cab800af743b3db1b6da0023918dfa89790 (diff)
downloadtk-1a74e9de135efaea49d48f7974960bc6e8426949.zip
tk-1a74e9de135efaea49d48f7974960bc6e8426949.tar.gz
tk-1a74e9de135efaea49d48f7974960bc6e8426949.tar.bz2
Fix [7d967c68a09e07e355358af40f36dd5dd84c7022|7d967c68a0] follow-up: Tk applications segmentation fault when ibus-daemon IME is restarted. Patch by Brad Lanam.
-rw-r--r--generic/tkWindow.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index e4d696b..690a841 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;