Add checking condition when change factory

Change-Id: I7897bfddc9668d67e72a1473cb5d03c970cef3be

diff --git a/configure.ac b/configure.ac
index 3d80387..3a51d17 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.5723, isf@samsung.com)
+AC_INIT(isf, 2.3.5724, 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=5723
+ISF_MICRO_VERSION=5724
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/debian/changelog b/debian/changelog
index 7753a3b..7fb39b8 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+isf (2.3.5724-1slp2+1) unstable; urgency=low
+
+  * [isf-panel-efl] Add checking condition when change factory
+  * Git: framework/uifw/isf
+  * Tag: isf_2.3.5724-1slp2+1
+
+ -- Haifeng Deng <haifeng.deng@samsung.com>  Mon, 24 Sep 2012 15:19:00 +0900
+
 isf (2.3.5723-1slp2+1) unstable; urgency=low
 
   * [isf-panel-efl] Support candidate showing when target is rotated

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index b7f6620..c179f57 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -2597,6 +2597,11 @@ static void slot_set_keyboard_ise (int type, const String &uuid)
     if (uuid.length () <= 0)
         return;
 
+    String ise_uuid, ise_name;
+    isf_get_keyboard_ise (ise_uuid, ise_name, _config);
+    if (ise_uuid == uuid)
+        return;
+
     String language = String ("~other");/*scim_get_locale_language (scim_get_current_locale ());*/
     _config->write (String (SCIM_CONFIG_DEFAULT_IMENGINE_FACTORY) + String ("/") + language, uuid);
     _config->flush ();

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 0d469b0..f7f963f 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -1,10 +1,10 @@
-#sbs-git:framework/uifw/isf isf 2.3.5723 07f2b65224e6cef5cd6799065bb01fa656bc115e
+#sbs-git:framework/uifw/isf isf 2.3.5724 07f2b65224e6cef5cd6799065bb01fa656bc115e
 %define _usrdir        /usr
 %define _ugdir %{_usrdir}/ug
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.5723
+Version:    2.3.5724
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index 4e22dcc..1d9a60d 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,7 @@
+ISF 2.3.5724 :
+  1. [isf-panel-efl] Add checking condition when change factory
+
+
 ISF 2.3.5723 :
   1. Support candidate showing when target is rotated