Remove ecore dependency

Change-Id: I4fd60f6bbed94b3fb708d4762a2a60e7761c354e
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/packaging/nlp.spec b/packaging/nlp.spec
index d17f0227300272aa0e7fed5688472adfa858ca2c..14e50686247995b74c49fa7f8f2c64898b42b60a 100755 (executable)
--- a/packaging/nlp.spec
+++ b/packaging/nlp.spec
@@ -14,7 +14,6 @@ BuildRequires: python3-base
 BuildRequires: pkgconfig(python3-embed)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(rpc-port)
-BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(gmock)
 Requires: python3-numpy
 Requires: python3-xml

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 07dd7e0478d9962fb6f0f8571b973808abb61e12..ef5a8bdd6d018662eae8f494f079a6b49cdcebcd 100755 (executable)
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -30,7 +30,6 @@ pkg_check_modules(pkgs REQUIRED
         python3-embed
         glib-2.0
         rpc-port
-        ecore
     )
 FOREACH(flag ${pkgs_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -fpie")

diff --git a/service/src/service.c b/service/src/service.c
index 17d3e0dbfcd6bf64ae8f60eee3c0d589a986e3b5..4a11dfae3c12a359d1e34048d8d0e51aba897458 100755 (executable)
--- a/service/src/service.c
+++ b/service/src/service.c
@@ -2,7 +2,6 @@
 #include <dlfcn.h>
 #include <service_app.h>
 #include <glib.h>
-#include <Ecore.h>
 
 #undef _POSIX_C_SOURCE
 #include "service.h"
@@ -19,8 +18,8 @@ typedef enum {
     NLTK_CMD_UNKNOWN
 } NLTK_CMDS;
 
-int sec = 180.0;
-static Ecore_Timer *service_close_timer = NULL;
+static int self_termination_timer_sec = 60;
+static gint service_close_timer = 0;
 
 struct client_s {
     char *id;
@@ -57,27 +56,26 @@ static struct client_s *__create_client(const char *id,
     return handle;
 }
 
-static Eina_Bool timer_cb(void *data)
+gboolean timer_cb(gpointer data)
 {
     PLOG("time runs out");
-    service_close_timer = NULL;
+    service_close_timer = 0;
     service_app_exit();
-    return ECORE_CALLBACK_CANCEL;
+
+    return FALSE;
 }
 
 void stop_timer()
 {
-    if (service_close_timer != NULL) {
-        ecore_timer_del(service_close_timer);
-        service_close_timer = NULL;
-    }
+    g_source_remove(service_close_timer);
+    service_close_timer = 0;
 }
 
 void start_timer()
 {
     stop_timer();
-    service_close_timer = ecore_timer_add(sec,timer_cb,NULL);
-    if (service_close_timer == NULL)
+    service_close_timer = g_timeout_add(self_termination_timer_sec*1000, timer_cb, NULL);
+    if (service_close_timer == 0)
         PLOG("failed to create timer");
 }
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3e4d5b5755a3798f3ffcd71b53229ab4dd4695fb..d6b58b0c4b5ab09f0420a869838bef14d0908770 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,6 @@ pkg_check_modules(pkgs REQUIRED
        python3-embed
        glib-2.0
        rpc-port
-       ecore
        gmock
 )