[immodule] avoid to send focus-in in the input panel disabled context

Change-Id: Iaac636eaa67e5f74f80683153a394566fe6300d8

diff --git a/configure.ac b/configure.ac
index 6d72c56..b86ab2f 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.4.6329, isf@samsung.com)
+AC_INIT(isf, 2.4.6401, 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=4
-ISF_MICRO_VERSION=6329
+ISF_MICRO_VERSION=6401
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index 5d455bd..6e9a3b3 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -1135,7 +1135,8 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx)
 
     if (context_scim && context_scim->impl) {
         _focused_ic = context_scim;
-        isf_imf_context_control_focus_in (ctx);
+        if (ecore_imf_context_input_panel_enabled_get (ctx) == EINA_TRUE)
+            isf_imf_context_control_focus_in (ctx);
 
         _panel_client.prepare (context_scim->id);
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 1d94d17..a61f3df 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6329
+Version:    2.4.6401
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index c2ef358..dfa972b 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,9 @@
+ISF 2.4.6401 :
+ 1. [immodule] support layout variation
+ 2. [demo] Add demo for a variety of layout variations
+ 3. [setting] item should not be highlighted on dragging
+
+
 ISF 2.4.6329 :
  1. [immodule] reset input panel state if state callback will not be called in 5 seconds
  2. [panel] fix rotation error of candidate window