From 95fc28a20282a3196e9c9864e3a2183ee689cd08 Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Mon, 1 Apr 2013 19:04:59 +0800 Subject: Merge with master branch Change-Id: Ie41101ea40d8713cdad7957596d7595f5a69f094 --- configure.ac | 4 ++-- packaging/ise-engine-default.spec | 2 +- src/isf_default_imengine.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c1db1d4..b3f8d27 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(ise-default, 0.1.1, li2012.zhang@samsung.com) +AC_INIT(ise-default, 0.1.5023, li2012.zhang@samsung.com) AC_CONFIG_SRCDIR([src/isf_default_imengine.cpp]) # Save this value here, since automake will set cflags and cxxflags later @@ -8,7 +8,7 @@ cppflags_set=${CPPFLAGS+set} ISF_DEFAULT_MAJOR_VERSION=0 ISF_DEFAULT_MINOR_VERSION=1 -ISF_DEFAULT_MICRO_VERSION=1 +ISF_DEFAULT_MICRO_VERSION=5023 ISF_DEFAULT_VERSION=$ISF_DEFAULT_MAJOR_VERSION.$ISF_DEFAULT_MINOR_VERSION.$ISF_DEFAULT_MICRO_VERSION diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec index afe3f8c..902ddc3 100644 --- a/packaging/ise-engine-default.spec +++ b/packaging/ise-engine-default.spec @@ -1,7 +1,7 @@ Name: ise-engine-default Summary: Multilingual Keyboard ISE Version: 0.1.5023 -Release: 5 +Release: 6 Group: System Environment/Libraries License: Apache License, Version 2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/isf_default_imengine.cpp b/src/isf_default_imengine.cpp index 42c8947..06b9d75 100644 --- a/src/isf_default_imengine.cpp +++ b/src/isf_default_imengine.cpp @@ -242,6 +242,7 @@ void DefaultInstance::flush() { } void DefaultInstance::focus_in() { + hide_lookup_table(); } void DefaultInstance::focus_out() { -- cgit v1.2.3