Use inputmethod manager API

Change-Id: I827916793a678cd7d5c06161e216070ca8a0ece8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41cc8388f8b8a8af0141402695b95b7385fa833e..31fbdadfc1d2c6edf8aeb5d4b5427b375d44abc8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
 capi-appfw-application isf elementary
-efl-extension dlog
+efl-extension dlog capi-ui-inputmethod-manager
 )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp
index d7514f32296c53fe5d73c7a659f8016384cfe082..8fdab2acd8af1e3a562026e3743d95bd6cb5dbd0 100644 (file)
--- a/im_setting_list/input_method_setting_list_popup_view.cpp
+++ b/im_setting_list/input_method_setting_list_popup_view.cpp
@@ -22,6 +22,7 @@
 #include <vector>
 #include <isf_control.h>
 #include <algorithm>
+#include <inputmethod_manager.h>
 
 #define IM_SETTING_LIST_POPUP_VIEW_TITLE          dgettext(PACKAGE, "IDS_ST_HEADER_DEFAULT_KEYBOARD_ABB")
 #define IM_SETTING_SELECT_KEYBOARD                dgettext(PACKAGE, "IDS_IME_BODY_SELECT_KEYBOARD")
@@ -65,7 +66,13 @@ static void im_setting_list_load_active_ime_info(void)
     std::vector<ime_info_s>      active_ime_info_list_user;
     g_active_ime_info_list.clear();
     char *active_ime_appid = NULL;
-    isf_control_get_active_ime(&active_ime_appid);
+
+    int ret = ime_manager_get_active_ime(&active_ime_appid);
+    if (ret == IME_MANAGER_ERROR_NONE)
+        LOGD("get active ime : %s\n", active_ime_appid);
+    else
+        LOGW("Failed to get active ime. error : %d\n", ret);
+
     ime_info_s *info = NULL;
     int cnt = isf_control_get_all_ime_info(&info);
     if (info)

diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp
index eb0d5ca3284cf3a5a1c727343d06058ad0f8f67c..ce9e5318acd6f4ff116fac6bdb5260ad25f8277b 100644 (file)
--- a/im_setting_list/input_method_setting_list_ui.cpp
+++ b/im_setting_list/input_method_setting_list_ui.cpp
@@ -22,6 +22,7 @@
 #include <vector>
 #include <algorithm>
 #include <tzplatform_config.h>
+#include <inputmethod_manager.h>
 #include "isf_control.h"
 
 #define IM_SETTING_LIST_PACKAGE                 PACKAGE
@@ -163,7 +164,13 @@ static void im_setting_list_load_ime_info(void)
 static int im_setting_list_get_active_ime_index(void)
 {
     char *active_ime_appid = NULL;
-    isf_control_get_active_ime(&active_ime_appid);
+
+    int ret = ime_manager_get_active_ime(&active_ime_appid);
+    if (ret == IME_MANAGER_ERROR_NONE)
+        LOGD("get active ime : %s\n", active_ime_appid);
+    else
+        LOGW("Failed to get active ime. error : %d\n", ret);
+
     std::vector<ime_info_s>::iterator iter = g_ime_info_list.begin();
     std::vector<ime_info_s>::iterator end = g_ime_info_list.end();
     for (; iter != end; ++iter)

diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp
index 754e417683d42f293ce3da72c4ce058ac04d601e..20faeb77162b52d0bb03163c6583a5b255127042 100644 (file)
--- a/im_setting_selector/input_method_setting_selector_ui.cpp
+++ b/im_setting_selector/input_method_setting_selector_ui.cpp
@@ -23,6 +23,7 @@
 #include <app_control.h>
 #include <algorithm>
 #include <tzplatform_config.h>
+#include <inputmethod_manager.h>
 
 #define IM_SETTING_SELECTOR_PACKAGE        PACKAGE
 #define IM_SETTING_SELECTOR_LOCALE_DIR     tzplatform_mkpath(TZ_SYS_RO_APP, PACKAGE_NAME"/res/locale")
@@ -108,7 +109,13 @@ static void im_setting_selector_load_ime_info(void)
     std::vector<ime_info_s>      ime_info_list_user;
     g_ime_info_list.clear();
     char *active_ime_appid = NULL;
-    isf_control_get_active_ime(&active_ime_appid);
+
+    int ret = ime_manager_get_active_ime(&active_ime_appid);
+    if (ret == IME_MANAGER_ERROR_NONE)
+        LOGD("get active ime : %s\n", active_ime_appid);
+    else
+        LOGW("Failed to get active ime. error : %d\n", ret);
+
     ime_info_s *info = NULL;
     int cnt = isf_control_get_all_ime_info(&info);
     if (info)

diff --git a/packaging/org.tizen.inputmethod-setting.spec b/packaging/org.tizen.inputmethod-setting.spec
index 2c67ecb9c5dde9cd38db49b04d4a62002cfcc3f3..a15b3d8d8715e62f26de7570d734b2b882eb1a94 100644 (file)
--- a/packaging/org.tizen.inputmethod-setting.spec
+++ b/packaging/org.tizen.inputmethod-setting.spec
@@ -19,6 +19,7 @@ BuildRequires:  cmake
 BuildRequires:  efl-extension-devel
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  model-build-features
+BuildRequires:  pkgconfig(capi-ui-inputmethod-manager)
 
 %description
 Setting Application for ISF.