Add isf_control interfaces to work

Change-Id: Icda20ee19b048047c873a3a067a81d01ec956269

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f77c636..3dc207b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(maintainer "Sungmin Kwak <sungmin.kwak@samsung.com>")
 SET(description "Input Method Manager APIs")
 SET(service "ui")
 SET(submodule "inputmethod-manager")
-SET(dependents "dlog isf")
+SET(dependents "capi-base-common isf")
 
 SET(Services
         "application"

diff --git a/packaging/capi-ui-inputmethod-manager.spec b/packaging/capi-ui-inputmethod-manager.spec
index 0286967..81dbef0 100644 (file)
--- a/packaging/capi-ui-inputmethod-manager.spec
+++ b/packaging/capi-ui-inputmethod-manager.spec
@@ -6,7 +6,7 @@ Group:      Graphics & UI Framework/Input
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(isf)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig

diff --git a/src/inputmethod_manager.cpp b/src/inputmethod_manager.cpp
index 38a46ee..96f9029 100644 (file)
--- a/src/inputmethod_manager.cpp
+++ b/src/inputmethod_manager.cpp
@@ -14,34 +14,44 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dlog.h>
+#include "isf_control.h"
 #include <inputmethod_manager.h>
 
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-#define LOG_TAG "INPUTMETHOD_MANAGER"
-
 int ime_manager_show_ime_list(void)
 {
+    isf_control_show_ime_list();
     return IME_MANAGER_ERROR_NONE;
 }
 
 int ime_manager_show_ime_selector(void)
 {
+    isf_control_show_ime_selector();
     return IME_MANAGER_ERROR_NONE;
 }
 
 int ime_manager_is_ime_enabled(const char *app_id, bool *enabled)
 {
+    if (!app_id || !enabled)
+        return IME_MANAGER_ERROR_INVALID_PARAMETER;
+
+    int ret = isf_control_is_ime_enabled(app_id, enabled);
+    if (ret < 0)
+        return IME_MANAGER_ERROR_OPERATION_FAILED;
+
     return IME_MANAGER_ERROR_NONE;
 }
 
 int ime_manager_get_active_ime(char **app_id)
 {
+    if (!app_id)
+        return IME_MANAGER_ERROR_INVALID_PARAMETER;
+
+    int ret = isf_control_get_active_ime(app_id);
+    if (ret < 0)
+        return IME_MANAGER_ERROR_OPERATION_FAILED;
+
     return IME_MANAGER_ERROR_NONE;
 }