Remove ecore handling routine as it is not used anymore

Change-Id: Icf5428190ccf6b50ddec9eb89b6b055893e85337
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1968908baf03d29fffc45685ef5bd8942bdb36c..8a8486e6ab881b4695593515b6f57cd73e5c7588 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,14 +28,6 @@ SET(DEPS
        context-provider
 )
 
-IF("${MAINLOOP}" STREQUAL "ecore")
-       ADD_DEFINITIONS("-D_USE_ECORE_MAIN_LOOP_")
-       SET(DEPS
-               ${DEPS}
-               ecore
-       )
-ENDIF("${MAINLOOP}" STREQUAL "ecore")
-
 # Common Options
 INCLUDE(FindPkgConfig)
 INCLUDE_DIRECTORIES(

diff --git a/packaging/context-service.spec b/packaging/context-service.spec
index 7a8deba4b9470cb90ae95b08b6b154d30be7abb3..8e5fcaa3c8fdaebaaef8fad4154cfa217eccb2c9 100644 (file)
--- a/packaging/context-service.spec
+++ b/packaging/context-service.spec
@@ -8,9 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:       context-service.service
 Source2:       org.tizen.context.conf
 
-# For active window hooking, we need to use 'ecore' mainloop instead of the 'glib' mainloop.
-%define MAINLOOP glib
-
 BuildRequires: cmake
 BuildRequires: sed
 BuildRequires: pkgconfig(libtzplatform-config)
@@ -24,10 +21,6 @@ BuildRequires: pkgconfig(alarm-service)
 BuildRequires: pkgconfig(notification)
 BuildRequires: pkgconfig(capi-system-system-settings)
 
-%if "%{MAINLOOP}" == "ecore"
-BuildRequires: pkgconfig(ecore)
-%endif
-
 BuildRequires: pkgconfig(cynara-creds-gdbus)
 BuildRequires: pkgconfig(cynara-client)
 BuildRequires: pkgconfig(cynara-session)
@@ -63,7 +56,7 @@ export   CFLAGS+=" -DTIZEN_ENGINEER_MODE"
 export CXXFLAGS+=" -DTIZEN_ENGINEER_MODE"
 export   FFLAGS+=" -DTIZEN_ENGINEER_MODE"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DMAINLOOP=%{MAINLOOP}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/src/server.cpp b/src/server.cpp
index 1544bca13299f12662996806c1978979f93fef78..45d17af61d951a013cd4fe9f038552070430324b 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -27,12 +27,7 @@
 #include "context_trigger/trigger.h"
 #include "server.h"
 
-#ifdef _USE_ECORE_MAIN_LOOP_
-#include <Ecore.h>
-#else
 static GMainLoop *mainloop = NULL;
-#endif
-
 static bool started = false;
 
 static ctx::context_manager_impl *context_mgr = NULL;
@@ -44,12 +39,7 @@ static ctx::context_trigger *trigger = NULL;
 void ctx::server::initialize()
 {
        _I("Init MainLoop");
-#ifdef _USE_ECORE_MAIN_LOOP_
-       ecore_init();
-       ecore_main_loop_glib_integrate();
-#else
        mainloop = g_main_loop_new(NULL, FALSE);
-#endif
 
        _I("Init Dbus Connection");
        dbus_handle = new(std::nothrow) ctx::dbus_server_impl();
@@ -60,11 +50,7 @@ void ctx::server::initialize()
 
        // Start the main loop
        _I(CYAN("Launching Context-Service"));
-#ifdef _USE_ECORE_MAIN_LOOP_
-       ecore_main_loop_begin();
-#else
        g_main_loop_run(mainloop);
-#endif
 }
 
 void ctx::server::activate()
@@ -108,11 +94,7 @@ CATCH:
        _E(RED("Launching Failed"));
 
        // Stop the main loop
-#ifdef _USE_ECORE_MAIN_LOOP_
-       ecore_main_loop_quit();
-#else
        g_main_loop_quit(mainloop);
-#endif
 }
 
 void ctx::server::release()
@@ -138,11 +120,7 @@ void ctx::server::release()
        if (timer_mgr)
                timer_mgr->release();
 
-#ifdef _USE_ECORE_MAIN_LOOP_
-       ecore_shutdown();
-#else
        g_main_loop_unref(mainloop);
-#endif
 
        delete trigger;
        delete context_mgr;
@@ -163,11 +141,7 @@ static void signal_handler(int signo)
        _I("SIGNAL %d received", signo);
 
        // Stop the main loop
-#ifdef _USE_ECORE_MAIN_LOOP_
-       ecore_main_loop_quit();
-#else
        g_main_loop_quit(mainloop);
-#endif
 }
 
 int main(int argc, char* argv[])