remove ui_create_candidate_window() in slot_set_keyboard_ise

Change-Id: Ief81643d9bad1967b48b41b243a4d07625d0ec35

diff --git a/configure.ac b/configure.ac
index 50a4689..ac171d3 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.6308, isf@samsung.com)
+AC_INIT(isf, 2.4.6309, 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=6308
+ISF_MICRO_VERSION=6309
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index d3dcf57..3e02cd8 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -2915,8 +2915,9 @@ static void slot_set_keyboard_ise (const String &uuid)
         add_keyboard_ise_em (uuid, _module_names[get_ise_index (uuid)]);
     }
 
-    if (_candidate_window)
-        ui_create_candidate_window ();
+    // Do not create new candidate window for set_keyboard_ise
+    //if (_candidate_window)
+    //    ui_create_candidate_window ();
 }
 
 /**

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 0ef3c5b..dbe3071 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6308
+Version:    2.4.6309
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index ed20791..9f12aaa 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,7 @@
+ISF 2.4.6309 :
+ 1. [isf-panel-efl] remove ui_create_candidate_window() in slot_set_keyboard_ise
+
+
 ISF 2.4.6308 :
  1. [demo] change code for implementing editfield