Compare window ID in X window focus out callback function

Change-Id: I18a1b8487614cb0b2a70e4dc9e86f53ce11c6b9c

diff --git a/configure.ac b/configure.ac
index 2f7fea9..75b5217 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.3.6118, isf@samsung.com)
+AC_INIT(isf, 2.3.6119, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=3
-ISF_MICRO_VERSION=6118
+ISF_MICRO_VERSION=6119
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.cpp b/ism/extras/efl_immodule/isf_imf_control_ui.cpp
index 9a09d9e..3329010 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_control_ui.cpp
+++ b/ism/extras/efl_immodule/isf_imf_control_ui.cpp
@@ -332,8 +332,11 @@ static Eina_Bool _compare_context (Ecore_IMF_Context *ctx1, Ecore_IMF_Context *c
 
 static Eina_Bool _client_window_focus_out_cb (void *data, int ev_type, void *ev)
 {
+    Ecore_X_Event_Window_Focus_Out *e = (Ecore_X_Event_Window_Focus_Out *)ev;
     Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)data;
-    if (!ctx) return ECORE_CALLBACK_PASS_ON;
+
+    if (!ctx || !e) return ECORE_CALLBACK_PASS_ON;
+    if (e->win != (Ecore_X_Window)ecore_imf_context_client_window_get (ctx)) return ECORE_CALLBACK_PASS_ON;
 
     isf_imf_context_input_panel_instant_hide (ctx);
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 8c42eb2..68d604d 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.6118
+Version:    2.3.6119
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index 5815d98..ca04d4f 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,7 @@
+ISF 2.3.6119 :
+ 1. [immodule] Compare window ID in X window focus out callback function
+
+
 ISF 2.3.6118 :
  1. [immodule] Hide IME after rendering conformant area
  2. [immodule] add X window focus out handler for X based application