[setting]fix : reset option couldn't work well

Change-Id: I6925c388c43b61b5da57b28a1f4aa4af88cb1f5f

diff --git a/configure.ac b/configure.ac
index ec41442471719a3c36d2e31ec35340c9f6d6b764..55fddc32921be5308166337f60771daae8232441 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.6128, isf@samsung.com)
+AC_INIT(isf, 2.3.6129, 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=6128
+ISF_MICRO_VERSION=6129
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp
index 892dae1d12c9fee13ad48f87f90c71c68aac36c0..d3a072a1b3eeedec9b17f4193ae62faafcf307a4 100644 (file)
--- a/ism/extras/efl_setting/isf_setting_efl.cpp
+++ b/ism/extras/efl_setting/isf_setting_efl.cpp
@@ -1434,6 +1434,13 @@ extern "C"
         if (vconf_set_bool (VCONFKEY_AUTOPERIOD_ALLOW_BOOL, false) == -1)
             return -1;
 
+        if (_imf_context == NULL) {
+            const char *ctx_id = ecore_imf_context_default_id_get ();
+            if (ctx_id) {
+                _imf_context = ecore_imf_context_add (ctx_id);
+            }
+        }
+
         load_config_module ();
         isf_load_ise_information (ALL_ISE, _config);
 
@@ -1473,6 +1480,11 @@ extern "C"
 
         _config->reload ();
         helper_ise_reload_config ();
+
+        if (_imf_context != NULL) {
+            ecore_imf_context_del (_imf_context);
+            _imf_context = NULL;
+        }
         return 0;
     }
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index de1fb60e430746111820df155dd6dadd288effab..62f48b0502d1ca4d2689c52fa29e047dbb4e001b 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,8 +3,8 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.6128
-Release:    5
+Version:    2.3.6129
+Release:    1
 Group:      System Environment/Libraries
 License:    LGPL
 Source0:    %{name}-%{version}.tar.gz

diff --git a/releasenote.txt b/releasenote.txt
index 20bfd10cb6e7e7c4fc2faabf098e75452c09dae9..9206b240583dd9596572809aef9d1287efb643f6 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,7 @@
+ISF 2.3.6129 :
+ 1. [setting]fix: reset couldn't work well
+
+
 ISF 2.3.6128 :
  1. [immodule] display a variety of event logs in dlog
  2. [immodule] change input panel state when root window property is changed