Changed ise-default to be an executable module

Change-Id: If70aaa7d4306776fc9e02b78006bee6d7bc2079e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c215d9..f502f35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ SET(ISE_SRCS
 SET(ISE_PACKAGE ${PROJECT_NAME})
 SET(ISE_PKGNAME ${PACKAGE})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(ISE_BINDIR "${TZ_SYS_RO_APP}/${ISE_PACKAGE}/bin")
 SET(ISE_LIBDIR "${TZ_SYS_RO_APP}/${ISE_PACKAGE}/lib")
 SET(ISE_RESDIR "${TZ_SYS_RO_APP}/${ISE_PACKAGE}/res")
 SET(ISE_LAYOUTDIR "${ISE_RESDIR}/720x1280/default")
@@ -65,7 +66,7 @@ ADD_DEFINITIONS("-DLAYOUTDIR=\"${ISE_LAYOUTDIR}\"")
 ADD_DEFINITIONS(-DISE_NAME=\"/ise-default\")
 ADD_DEFINITIONS(-DSUPPORTS_EMOTICONS)
 
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${ISE_SRCS})
+ADD_EXECUTABLE(${PROJECT_NAME} ${ISE_SRCS})
 
 # For edc File
 ADD_CUSTOM_TARGET(
@@ -118,7 +119,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/layout_keypad.edj DESTINATION ${ISE_LAYOUTDIR}
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ISE_PKGS_LDFLAGS})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${ISE_LIBDIR})
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${ISE_BINDIR})
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.xml DESTINATION
         ${TZ_SYS_RO_PACKAGES})

diff --git a/ise-default.xml b/ise-default.xml
index 7eb3049..e028022 100644 (file)
--- a/ise-default.xml
+++ b/ise-default.xml
@@ -4,7 +4,7 @@
 <description/>
 <label>Tizen keyboard</label>
 <icon/>
-<ui-application appid="ise-default" exec="/usr/lib/scim-1.0/scim-helper-launcher" nodisplay="true" taskmanage="false" multiple="false" type="capp" hw-acceleration="use-system-setting" mainapp="true">
+<ui-application appid="ise-default" exec="ise-default" nodisplay="true" taskmanage="false" multiple="false" type="capp" hw-acceleration="use-system-setting" mainapp="true">
     <category name="http://tizen.org/category/ime"/>
     <label>Tizen keyboard</label>
     <label xml:lang="ar-ae">لوحة مفاتيح Tizen</label>
@@ -91,5 +91,6 @@
 </ui-application>
 <privileges>
     <privilege>http://tizen.org/privilege/ime</privilege>
+    <privilege>http://tizen.org/privilege/haptic</privilege>
 </privileges>
 </manifest>

diff --git a/src/ise.cpp b/src/ise.cpp
index f027f22..f520a7d 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -772,7 +772,6 @@ on_input_mode_changed(const sclchar *key_value, sclulong key_event, sclint key_t
     return ret;
 }
 
-
 SCLEventReturnType CUIEventCallback::on_event_notification(SCLUINotiType noti_type, SclNotiDesc *etc_info)
 {
     SCLEventReturnType ret = SCL_EVENT_PASS_ON;
@@ -1647,3 +1646,10 @@ static void update_recent_used_punctuation(const char * key_value)
         g_recent_used_punctuation.erase(g_recent_used_punctuation.begin());
     }
 }
+
+int main (int argc, char *argv[])
+{
+    g_core.run();
+
+    return 0;
+}