Merge branch 'tizen_5.5' into tizen

Change-Id: I4b0213eb8f750f0a80d7babe831a0baad9cf08a5

diff --cc Makefile.am
index 305ab06,b6479a1..e76fa4f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -34,7 -34,7 +34,7 @@@ EXTRA_DIST            = config.rpath 
                          intltool-update.in
  
  AUTOMAKE_OPTIONS      = gnu
- SUBDIRS               = ism/src ism/utils ism/modules ism/configs po ism/extras ism/data ism/demos ism/tests
 -SUBDIRS               = ism/src ism/utils ism/modules ism/configs po ism/extras ism/data ism/demos engine-loader/
++SUBDIRS               = ism/src ism/utils ism/modules ism/configs po ism/extras ism/data ism/demos ism/tests engine-loader
  
  MAINTAINERCLEANFILES  = Makefile.in \
                          aclocal.m4 \

diff --cc configure.ac
Simple merge

diff --cc ism/demos/Makefile.am
Simple merge

diff --cc ism/extras/efl_panel/isf_panel_efl.cpp
index 1ca8a35,f6fc9da..f0b838d
--- 1/ism/extras/efl_panel/isf_panel_efl.cpp
--- 2/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@@ -37,10 -37,14 +37,14 @@@
  #include <unistd.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <malloc.h>
+ 
  #include <Eina.h>
  #include <Ecore.h>
- #include <malloc.h>
 -#include <Ecore_File.h>
 +#include <glib.h>
+ #include <tzplatform_config.h>
+ #include <system_info.h>
+ 
  #include "scim_private.h"
  #include "scim.h"
  #include "scim_stl_map.h"
@@@ -7785,14 -7923,13 +7800,16 @@@ int main (int argc, char *argv []
      _candidate_font_size = (int)(_candidate_font_size * (_width_rate < _height_rate ? _width_rate : _height_rate));
  #endif /* CANDIDATE */
  
+     set_tizen_profile();
+ 
      /* Load ISF configuration */
      user_data_path = scim_get_user_data_dir ();
 -    user_data_path_exists = ecore_file_exists (user_data_path.c_str ());
 -    user_data_path_is_dir = ecore_file_is_dir (user_data_path.c_str ());
 +    user_data_path_exists = g_file_test (user_data_path.c_str(), G_FILE_TEST_EXISTS);
 +    user_data_path_is_dir = g_file_test (user_data_path.c_str(), G_FILE_TEST_IS_DIR);
      _launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), _launch_ise_on_request);
 +    if (vconf_set_bool (VCONFKEY_ISF_IME_LAUNCH_ON_DEMAND, _launch_ise_on_request) != 0)
 +        LOGW ("Failed to set vconf key");
 +
      if (user_data_path_exists && user_data_path_is_dir) {
          load_config ();
      } else {

diff --cc ism/extras/wayland_immodule/wayland_imcontext.c
Simple merge

diff --cc ism/src/Makefile.am
Simple merge

diff --cc ism/src/isf_query_utility.cpp
Simple merge

diff --cc ism/src/scim_helper.cpp
index 984052e,2cffbd4..370dd61
--- 1/ism/src/scim_helper.cpp
--- 2/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@@ -242,8 -245,8 +246,8 @@@ public
      HelperAgentImpl (HelperAgent* thiz) : magic(0), magic_active(0), timeout(-1), focused_ic ((uint32) -1), thiz (thiz),
          surrounding_text (NULL), selection_text (NULL), cursor_pos (0),
          need_update_surrounding_text (0), need_update_selection_text (0),
 -        layout (0), ise_show_flag (false), need_update_entry_metadata (true), ise_focus_flag (false),
 +        layout (0), ise_show_flag (false), hw_keyboard_mode (false), need_update_entry_metadata (false), ise_focus_flag (false),
-         finalized_text(NULL), finalized_cursor_pos(0) {
+         finalized_text(NULL), finalized_cursor_pos(0), engine_loader_flag(false) {
      }
  
      ~HelperAgentImpl () {
@@@ -589,7 -592,7 +593,7 @@@ public
          }
      }
  private:
-     HelperAgentImpl () : magic (0), magic_active (0), timeout (-1), focused_ic ((uint32) -1), thiz (NULL), surrounding_text (NULL), selection_text (NULL), cursor_pos (0), need_update_surrounding_text (0), need_update_selection_text (0), layout (0), ise_show_flag (false), hw_keyboard_mode (false), need_update_entry_metadata (false), ise_focus_flag (false), finalized_text (NULL), finalized_cursor_pos (0) { }
 -    HelperAgentImpl () : magic (0), magic_active (0), timeout (-1), focused_ic ((uint32) -1), thiz (NULL), surrounding_text (NULL), selection_text (NULL), cursor_pos (0), need_update_surrounding_text (0), need_update_selection_text (0), layout (0), ise_show_flag (false), need_update_entry_metadata (true), ise_focus_flag (false), finalized_text (NULL), finalized_cursor_pos (0), engine_loader_flag (false) { }
++    HelperAgentImpl () : magic (0), magic_active (0), timeout (-1), focused_ic ((uint32) -1), thiz (NULL), surrounding_text (NULL), selection_text (NULL), cursor_pos (0), need_update_surrounding_text (0), need_update_selection_text (0), layout (0), ise_show_flag (false), hw_keyboard_mode (false), need_update_entry_metadata (false), ise_focus_flag (false), finalized_text (NULL), finalized_cursor_pos (0), engine_loader_flag (false) { }
  };
  
  static MessageQueue message_queue;

diff --cc ism/src/tizen_profile.h
Simple merge

diff --cc packaging/isf.spec
index d566200,4a642cf..9ad8ba6
--- 1/packaging/isf.spec
--- 2/packaging/isf.spec
+++ b/packaging/isf.spec
@@@ -3,12 -3,15 +3,15 @@@
  %bcond_with wayland
  Name:       isf
  Summary:    Input Service Framework
 -Version:    5.5.42
 +Version:    6.0.24
  Release:    1
  Group:      Graphics & UI Framework/Input
- License:    LGPL-2.1+
+ License:    LGPL-2.1+,GPL-2.0+
  Source0:    %{name}-%{version}.tar.gz
  Source100:  %{name}.conf
+ Source200:  engine-loader.service
+ Source300:  org.tizen.engine-loader.service
+ Source400:  engine-loader.conf
  BuildRequires:  edje-bin
  BuildRequires:  gettext-tools
  BuildRequires:  pkgconfig(elementary)
@@@ -32,11 -37,11 +35,11 @@@ BuildRequires:  pkgconfig(glib-2.0
  BuildRequires:  pkgconfig(efl-extension)
  BuildRequires:  pkgconfig(libtzplatform-config)
  BuildRequires:  pkgconfig(pkgmgr-info)
- BuildRequires:  pkgconfig(db-util)
+ BuildRequires:  pkgconfig(sqlite3)
  BuildRequires:  pkgconfig(aul)
  BuildRequires:  pkgconfig(capi-appfw-app-control)
 -BuildRequires:  pkgconfig(capi-appfw-application)
 +BuildRequires:  pkgconfig(capi-appfw-app-common)
 +BuildRequires:  pkgconfig(capi-appfw-service-application)
  BuildRequires:  pkgconfig(cynara-client)
  BuildRequires:  pkgconfig(cynara-creds-socket)
  BuildRequires:  pkgconfig(cynara-session)
@@@ -44,7 -49,7 +47,8 @@@ BuildRequires:  pkgconfig(capi-appfw-pa
  BuildRequires:  pkgconfig(capi-system-info)
  BuildRequires:  pkgconfig(libsystemd)
  BuildRequires:  pkgconfig(notification)
 +BuildRequires:  pkgconfig(gmock)
+ BuildRequires:  pkgconfig(gio-2.0)
  Requires(postun): /sbin/ldconfig
  Requires:     org.tizen.isf-kbd-mode-changer
  
@@@ -69,16 -74,9 +73,17 @@@ Requires: %{name} = %{version}-%{releas
  %description -n org.tizen.isf-kbd-mode-changer
  Keyboard mode changer application
  
 +%package unittests
 +Summary: Unit test cases for isf
 +Group: Graphics & UI Framework/Input
 +Requires: %{name} = %{version}-%{release}
 +
 +%description unittests
 +Unit test cases for isf
 +
  %prep
  %setup -q
+ cp %{SOURCE300} .
  
  %build
  export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"