Merge "[3.0] Move ELDbus init & shutdown to Tizen Framework" into tizen_3.0

[platform/core/uifw/dali-adaptor.git] / adaptors / common / application-impl.cpp

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index db48c41..bdc6268 100644 (file)
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -28,11 +28,6 @@
 #include <singleton-service-impl.h>
 #include <lifecycle-controller-impl.h>
 
-// CONDITIONAL INCLUDES
-#ifdef DALI_ELDBUS_AVAILABLE
-#include <Eldbus.h>
-#endif // DALI_ELDBUS_AVAILABLE
-
 namespace Dali
 {
 
@@ -52,13 +47,6 @@ namespace Internal
 namespace Adaptor
 {
 
-#if defined(DEBUG_ENABLED)
-namespace
-{
-Integration::Log::Filter* gDBusLogging = Integration::Log::Filter::New( Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_DBUS" );
-} // anonymous namespace
-#endif
-
 ApplicationPtr Application::New(
   int* argc,
   char **argv[],
@@ -117,12 +105,6 @@ Application::~Application()
   delete mCommandLineOptions;
   delete mAdaptor;
 
-#ifdef DALI_ELDBUS_AVAILABLE
-  // Shutdown ELDBus.
-  DALI_LOG_INFO( gDBusLogging, Debug::General, "Shutting down DBus\n" );
-  eldbus_shutdown();
-#endif
-
   mWindow.Reset();
 }
 
@@ -193,12 +175,6 @@ void Application::OnInit()
 
   CreateWindow();
 
-#ifdef DALI_ELDBUS_AVAILABLE
-  // Initialize ElDBus.
-  DALI_LOG_INFO( gDBusLogging, Debug::General, "Starting DBus Initialization\n" );
-  eldbus_init();
-#endif
-
   // Start the adaptor
   CreateAdaptor();
   mAdaptor->Start();