Revert "Added usage of service_app_main instead of appcore_efl_main"

This reverts commit 9391737d566c72f6a864e7b98c2c6b9777a91921.

Change-Id: Ib4069bf26793bc1dd6ab17db5effeaf30b8c9b9d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20a7467..650c47c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,6 @@ pkg_check_modules(pkgs REQUIRED
        capi-network-bluetooth
        notification
        capi-network-wifi
-       capi-appfw-service-application
        ${TAPI_REQUIRED_PKG}
 )
 

diff --git a/org.tizen.screen-reader.xml b/org.tizen.screen-reader.xml
index 10932c6..f13fa26 100755 (executable)
--- a/org.tizen.screen-reader.xml
+++ b/org.tizen.screen-reader.xml
@@ -2,7 +2,7 @@
 <manifest xmlns="http://tizen.org/ns/packages" api-version="2.4" package="org.tizen.screen-reader" version="0.1.0" install-location="internal-only">
         <label>screen-reader</label>
         <description>SMART NAVIGATOR</description>
-        <service-application appid="org.tizen.screen-reader" exec="/usr/apps/org.tizen.screen-reader/bin/screen-reader" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+        <ui-application appid="org.tizen.screen-reader" exec="/usr/apps/org.tizen.screen-reader/bin/screen-reader" nodisplay="true" multiple="false" type="capp" taskmanage="false">
                 <label>screen-reader</label>
                 <icon>/usr/apps/org.tizen.screen-reader/res/icons/screen-reader.png</icon>
                 <label xml:lang="en-us">screen-reader</label>
@@ -10,6 +10,6 @@
                     <operation name="http://tizen.org/appcontrol/operation/read_screen"/>
                 </app-control>
                 <background-category value="media"/>
-        </service-application>
+        </ui-application>
 </manifest>
 

diff --git a/packaging/org.tizen.screen-reader.spec b/packaging/org.tizen.screen-reader.spec
index 77e376c..396b8f9 100755 (executable)
--- a/packaging/org.tizen.screen-reader.spec
+++ b/packaging/org.tizen.screen-reader.spec
@@ -28,7 +28,6 @@ BuildRequires:  pkgconfig(check)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(capi-network-wifi)
-BuildRequires:  pkgconfig(capi-appfw-service-application)
 %if "%{?tizen_profile_name}" != "tv"
 BuildRequires:  pkgconfig(tapi)
 %endif

diff --git a/src/main.c b/src/main.c
index 2b20ab7..613d0d2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,8 +21,6 @@
 #include <appcore-efl.h>
 #include <Elementary.h>
 #include <eldbus-1/Eldbus.h>
-#include <service_app.h>
-#include <vconf.h>
 #include "navigator.h"
 #include "window_tracker.h"
 #include "logger.h"
@@ -211,27 +209,21 @@ void set_signal_handler()
        }
 }
 
-static bool app_create(void *data)
+static int app_create(void *data)
 {
-       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, 1))
-               ERROR("Can't set value of %s vconf key to 1", VCONFKEY_SETAPPL_ACCESSIBILITY_TTS);
-       DEBUG("atspi_init");
+       elm_init(0, NULL);
        atspi_init();
-       DEBUG("logger_init");
-       DEBUG("screen_reader_create_service");
+
        screen_reader_create_service(data);
 #ifndef SCREEN_READER_TV
-       DEBUG("screen_reader_gestures_init");
        screen_reader_gestures_init();
-       DEBUG("navigator_init");
        navigator_init();
 #endif
-       DEBUG("screen_reader_switch_enabled_set");
        screen_reader_switch_enabled_set(EINA_TRUE);
-       return true;
+       return 0;
 }
 
-static void app_terminate(void *data)
+static int app_terminate(void *data)
 {
        DEBUG("screen reader terminating");
 #ifndef SCREEN_READER_TV
@@ -245,15 +237,11 @@ static void app_terminate(void *data)
        DEBUG("clear ScreenReaderEnabled property");
        screen_reader_switch_enabled_set(EINA_FALSE);
        DEBUG("screen reader terminated");
-       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, 0))
-               ERROR("Can't set value of %s vconf key to 0", VCONFKEY_SETAPPL_ACCESSIBILITY_TTS);
+
        DEBUG("libatspi terminated");
        atspi_exit();
-}
 
-static void app_control(app_control_h app_control, void *data)
-{
-       return;
+       return 0;
 }
 
 int main(int argc, char **argv)
@@ -261,12 +249,14 @@ int main(int argc, char **argv)
        set_signal_handler();
        unsetenv("ELM_ATSPI_MODE");
 
+       struct appcore_ops ops = {
+               .create = app_create,
+               .terminate = app_terminate,
+               .pause = NULL,
+               .resume = NULL,
+               .reset = NULL
+       };
+       ops.data = get_pointer_to_service_data_struct();
 
-       service_app_lifecycle_callback_s event_callback;
-
-       event_callback.create = app_create;
-       event_callback.terminate = app_terminate;
-       event_callback.app_control = app_control;
-
-       return service_app_main(argc, argv, &event_callback, get_pointer_to_service_data_struct());
+       return appcore_efl_main("screen-reader", &argc, &argv, &ops);
 }

diff --git a/src/screen_reader_vconf.c b/src/screen_reader_vconf.c
index b2daef2..f6ae5c1 100644 (file)
--- a/src/screen_reader_vconf.c
+++ b/src/screen_reader_vconf.c
@@ -16,7 +16,6 @@
 
 #include <Elementary.h>
 #include <vconf.h>
-#include <service_app.h>
 #include "screen_reader_vconf.h"
 #include "screen_reader_spi.h"
 #include "logger.h"
@@ -43,7 +42,7 @@ void app_termination_cb(keynode_t * node, void *user_data)
        service_data->run_service = node->value.i;
 
        if (service_data->run_service == 0) {
-               service_app_exit();
+               elm_exit();
        }
 
        DEBUG("END");

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 881fdb5..75034d8 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,6 @@ pkg_check_modules(tests REQUIRED
     check
     vconf
     elementary
-    capi-appfw-service-application
 )
 
 FOREACH(flag ${tests_CFLAGS})