Merge branch 'tizen_6.0' into tizen

Change-Id: I8d66801259c69fd63d458ccc4ee9f2a16bc2b3cd

diff --git a/configure.ac b/configure.ac
index 1441844..2c27c3e 100644 (file)
--- 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, 6.0.45, isf@samsung.com)
+AC_INIT(isf, 6.0.46, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 
 ###########################################################
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([ism/src/scim.h])
 # ISF version
 ISF_MAJOR_VERSION=6
 ISF_MINOR_VERSION=0
-ISF_MICRO_VERSION=45
+ISF_MICRO_VERSION=46
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/engine-loader/src/engine_loader.cpp b/engine-loader/src/engine_loader.cpp
index a4e0d17..c8a58cf 100644 (file)
--- a/engine-loader/src/engine_loader.cpp
+++ b/engine-loader/src/engine_loader.cpp
@@ -554,6 +554,10 @@ void EngineLoader::flush_imengine()
 {
     if (!m_impl->si.null()) {
         m_impl->si->flush ();
+
+        int ret = engine_loader_send_message(g_variant_new("()"), "engine_loader_event_done");
+        if (ret != ENGINE_LOADER_ERROR_NONE)
+            LOGE("Failed to send event_done message");
     }
 }
 
@@ -561,6 +565,10 @@ void EngineLoader::reset_imengine()
 {
     if (!m_impl->si.null ()) {
         m_impl->si->reset ();
+
+        int ret = engine_loader_send_message(g_variant_new("()"), "engine_loader_event_done");
+        if (ret != ENGINE_LOADER_ERROR_NONE)
+            LOGE("Failed to send event_done message");
     }
 }
 

diff --git a/engine-loader/src/engine_loader_dbus.cpp b/engine-loader/src/engine_loader_dbus.cpp
index e459426..570e067 100644 (file)
--- a/engine-loader/src/engine_loader_dbus.cpp
+++ b/engine-loader/src/engine_loader_dbus.cpp
@@ -437,6 +437,15 @@ int engine_loader_send_message(GVariant *body, const char *cmd)
         return ENGINE_LOADER_ERROR_IO_ERROR;
     }
 
+    if (!g_dbus_connection_flush_sync(g_gdbus_connection,
+                                     nullptr,
+                                     &err)) {
+        if (err != NULL) {
+            LOGE("Failed to flush connection : %s", err->message);
+            g_error_free(err);
+        }
+    }
+
     return ENGINE_LOADER_ERROR_NONE;
 }
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index d218fc6..092092e 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 %bcond_with wayland
 Name:       isf
 Summary:    Input Service Framework
-Version:    6.0.45
+Version:    6.0.46
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    LGPL-2.1+