Fix socket read timeout issue

Change-Id: I40dd0a568d2a9e8853fd9b2dffac55bedbb1730c

diff --git a/configure.ac b/configure.ac
index bcd4d11..6d72c56 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.6326, isf@samsung.com)
+AC_INIT(isf, 2.4.6329, 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=6326
+ISF_MICRO_VERSION=6329
 
 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 de01a71..5d455bd 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -2526,7 +2526,7 @@ panel_iochannel_handler (void *data, Ecore_Fd_Handler *fd_handler)
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
     if (fd_handler == _panel_iochannel_read_handler) {
-        if (!_panel_client.filter_event ()) {
+        if (_panel_client.has_pending_event () && !_panel_client.filter_event ()) {
             panel_finalize ();
             panel_initialize ();
             return ECORE_CALLBACK_CANCEL;

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 1e01f84..1d94d17 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,8 +3,8 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6326
-Release:    2
+Version:    2.4.6329
+Release:    1
 Group:      System Environment/Libraries
 License:    LGPL
 Source0:    %{name}-%{version}.tar.gz

diff --git a/releasenote.txt b/releasenote.txt
index 4436921..c2ef358 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,9 @@
+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
+ 3. Fix socket read timeout
+
+
 ISF 2.4.6326 :
  1. [panel] Request to hide ISE before stop helper ISE
  2. [panel] fix default ISE launching issue