Fix to daemon running always

Change-Id: Idd4189591571a4d2762835a7198835cf952165e8
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e57eb7d..202a2ae 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,10 +43,8 @@ PKG_CHECK_MODULES(GOBJECT_DEPS REQUIRED gobject-2.0)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test)
 
-CONFIGURE_FILE(org.tizen.theme_manager.service.in org.tizen.theme_manager.service @ONLY)
 CONFIGURE_FILE(theme-manager.service.in theme-manager.service @ONLY)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.theme_manager.service DESTINATION ${PREFIX}/share/dbus-1/system-services/)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/theme-manager.service DESTINATION ${UNITDIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d
        FILES_MATCHING

diff --git a/org.tizen.theme_manager.service.in b/org.tizen.theme_manager.service.in
deleted file mode 100644 (file)
index 462f921..0000000
--- a/org.tizen.theme_manager.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.tizen.theme_manager
-Exec=/bin/false
-SystemdService=theme-manager.service

diff --git a/packaging/tizen-theme-manager.spec b/packaging/tizen-theme-manager.spec
index 38aa036..3ed76fe 100644 (file)
--- a/packaging/tizen-theme-manager.spec
+++ b/packaging/tizen-theme-manager.spec
@@ -82,7 +82,6 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %{_sysconfdir}/package-manager/parserlib/metadata/libtizen-theme-plugin.so
 %{_datarootdir}/parser-plugins/tizen-theme-plugin.info
 %{_unitdir}/theme-manager.service
-%{_datadir}/dbus-1/system-services/org.tizen.theme_manager.service
 %config %{_sysconfdir}/dbus-1/system.d/*theme_manager*.conf
 
 #################################################

diff --git a/src/main/main.cc b/src/main/main.cc
index bc05653..672a287 100644 (file)
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -26,11 +26,9 @@ class ThemeManager {
   void RenewTimeout(int ms);
 
   GMainLoop* loop_;
-  guint sid_;
 };
 
-ThemeManager::ThemeManager() :
-    loop_(nullptr), sid_(0) {
+ThemeManager::ThemeManager() : loop_(nullptr) {
 }
 
 ThemeManager::~ThemeManager() {
@@ -77,23 +75,9 @@ bool ThemeManager::Init() {
 
   r.Listen();
 
-  RenewTimeout(5000);
-
   return true;
 }
 
-void ThemeManager::RenewTimeout(int ms) {
-  if (sid_)
-    g_source_remove(sid_);
-  sid_ = g_timeout_add(ms,
-      [](gpointer user_data) {
-        g_main_loop_quit(
-            reinterpret_cast<ThemeManager*>(user_data)->loop_);
-        return FALSE;
-      },
-      this);
-}
-
 int main(int argc, char** argv) {
   ThemeManager service;
   if (!service.Init()) {