Fix reset defect when hardware keyboard is connected

Change-Id: Iafaf4692f270ac6557641868e48a408aac3ceb1e

diff --git a/configure.ac b/configure.ac
index 947f5c2..7a03ccf 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.5822, isf@samsung.com)
+AC_INIT(isf, 2.3.5823, 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=5822
+ISF_MICRO_VERSION=5823
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/debian/changelog b/debian/changelog
index 5a31d41..ebfa267 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+isf (2.3.5823-1slp2+1) unstable; urgency=low
+
+  * [isf-setting] Fix reset defect when hardware keyboard is connected
+  * Git: framework/uifw/isf
+  * Tag: isf_2.3.5823-1slp2+1
+
+ -- Haifeng Deng <haifeng.deng@samsung.com>  Tue, 23 Oct 2012 20:21:00 +0900
+
 isf (2.3.5822-1slp2+1) unstable; urgency=low
 
   * Add color style of preedit feature.

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index b5a36b6..6c80205 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -1923,10 +1923,6 @@ static void slot_show_candidate_table (void)
         return;
 
     evas_object_show (_candidate_area_1);
-    if (_candidate_0 [0] && evas_object_visible_get (_candidate_0 [0])) {
-        evas_object_show (_more_btn);
-    }
-    evas_object_hide (_close_btn);
     ui_candidate_window_adjust ();
 
     ui_candidate_show ();
@@ -2340,6 +2336,10 @@ static void update_table (int table_type, const LookupTable &table)
         evas_object_hide (_more_btn);
     } else if (!evas_object_visible_get (_candidate_area_2)) {
         evas_object_show (_more_btn);
+        evas_object_hide (_close_btn);
+    } else {
+        evas_object_hide (_more_btn);
+        evas_object_show (_close_btn);
     }
     elm_scroller_region_show (_candidate_area_1, 0, 0, _candidate_scroll_width, _item_min_height);
     elm_scroller_region_show (_candidate_area_2, 0, 0, _candidate_scroll_width, _item_min_height);

diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp
index 97f13fa..9e6494b 100644 (file)
--- a/ism/extras/efl_setting/isf_setting_efl.cpp
+++ b/ism/extras/efl_setting/isf_setting_efl.cpp
@@ -1447,7 +1447,7 @@ static void on_event (ui_gadget_h ug, enum ug_event event, service_h s, void *pr
 
 static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h s, void *priv)
 {
-    if ( ug == NULL || priv == NULL)
+    if (ug == NULL || priv == NULL)
         return ;
 
     struct ug_data *ugd = (struct ug_data *)priv;
@@ -1518,7 +1518,16 @@ extern "C"
         load_config_data (_config);
         isf_load_ise_information (ALL_ISE, _config);
 
-        String uuid =  scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String ("b70bf6cc-ff77-47dc-a137-60acc32d1e0c"));
+        String uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_UUID), String (SCIM_COMPOSE_KEY_FACTORY_UUID));
+        TOOLBAR_MODE_T type = (TOOLBAR_MODE_T)scim_global_config_read (String (SCIM_GLOBAL_CONFIG_INITIAL_ISE_TYPE), 0);
+        ecore_x_window_prop_card32_get (ecore_x_window_root_first_get (), ecore_x_atom_get (PROP_X_EXT_KEYBOARD_EXIST), &hw_kbd_num, 1);
+        if (hw_kbd_num != 0) {
+            if (type != TOOLBAR_KEYBOARD_MODE) {
+                _config->write (String (SCIM_CONFIG_DEFAULT_HELPER_ISE), uuid);
+                _config->flush ();
+                uuid = String (SCIM_COMPOSE_KEY_FACTORY_UUID);
+            }
+        }
         isf_control_set_active_ise_by_uuid (uuid.c_str ());
 
         String mdl_name;

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 809255d..18ec461 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -1,10 +1,10 @@
-#sbs-git:framework/uifw/isf isf 2.3.5820 07f2b65224e6cef5cd6799065bb01fa656bc115e
+#sbs-git:framework/uifw/isf isf 2.3.5823 07f2b65224e6cef5cd6799065bb01fa656bc115e
 %define _usrdir        /usr
 %define _ugdir %{_usrdir}/ug
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.5822
+Version:    2.3.5823
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index 5b64998..842d81b 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,7 @@
+ISF 2.3.5823 :
+  1. [isf-setting] Fix reset defect when hardware keyboard is connected
+
+
 ISF 2.3.5822 :
   1. Add color style of preedit feature