From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 8 Mar 2016 11:54:20 +0000 (+0900)
Subject: Support executable type of IME
X-Git-Tag: accepted/tizen/common/20160315.221828~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F61524%2F1;p=platform%2Fcore%2Fuifw%2Flibscl-core.git

Support executable type of IME

Change-Id: Ia7e8a69324e457e11bfd9bf49ece7f86811cc46f
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e065ab3..18d7cea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ SET(PKGS_CHECK_MODULES
         isf
         vconf
         libscl-common
+        capi-appfw-application
         )
 
 IF (with_wayland)
diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec
index 45ae01d..8f50dde 100644
--- a/packaging/libscl-core.spec
+++ b/packaging/libscl-core.spec
@@ -26,6 +26,7 @@ BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(x11)
 %endif
 BuildRequires:  pkgconfig(libscl-common)
+BuildRequires:  pkgconfig(capi-appfw-application)
 
 
 %description
diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp
index 66b20a3..84a6935 100644
--- a/src/sclcoreimpl.cpp
+++ b/src/sclcoreimpl.cpp
@@ -16,6 +16,8 @@
  */
 
 #include "sclcoreimpl.h"
+#include <app_common.h>
+#include <dlog.h>
 
 using namespace scl;
 
@@ -284,6 +286,27 @@ void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display)
 
 void CSCLCoreImpl::run()
 {
+    m_core_ui.init();
+    m_connection.init();
+
+    if (!m_uuid) {
+        char *appid = NULL;
+        app_get_id(&appid);
+
+        LOGD("appid : '%s'\n", appid);
+
+        if (appid) {
+            m_uuid = strdup(appid);
+            free(appid);
+        }
+    }
+
+    if (!m_display) {
+        const char *display = getenv("DISPLAY");
+        LOGD("display env : '%s'\n", display);
+        m_display = display ? strdup(display) : strdup(":0");
+    }
+
     m_core_ui.run(m_display);
 
     m_connection.fini();