From 1a74e9de135efaea49d48f7974960bc6e8426949 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 10 Feb 2017 11:38:55 +0000
Subject: Fix [7d967c68a09e07e355358af40f36dd5dd84c7022|7d967c68a0] follow-up:
 Tk applications segmentation fault when ibus-daemon IME is restarted. Patch
 by Brad Lanam.

---
 generic/tkWindow.c | 4 +---
 1 file changed, 1 insertion(+), 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;
-- 
cgit v0.12