Revert "Add init interface with main_window as a parameter"

[platform/core/uifw/libscl-core.git] / src / sclcoreimpl.cpp

diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp
index d81847c..554bdb7 100644 (file)
--- a/src/sclcoreimpl.cpp
+++ b/src/sclcoreimpl.cpp
@@ -26,15 +26,10 @@ CSCLCoreImpl::CSCLCoreImpl()
     m_event_callback = NULL;
     m_display = NULL;
     m_uuid = NULL;
-
-    m_initialized = FALSE;
 }
 
 CSCLCoreImpl::~CSCLCoreImpl()
 {
-    if (m_initialized) {
-        fini();
-    }
     if (m_display) {
         free(m_display);
         m_display = NULL;
@@ -52,18 +47,16 @@ CSCLCoreImpl::get_instance()
     return &instance;
 }
 
-void CSCLCoreImpl::init(sclwindow main_window)
+void CSCLCoreImpl::init(const sclchar *display)
 {
-    m_core_ui.init(main_window);
-
     m_connection.init();
-    m_connection.open_connection(m_display);
+    m_core_ui.init();
+
+    m_connection.open_connection(display);
 
     if (m_event_callback) {
         m_event_callback->on_init();
     }
-
-    m_initialized = TRUE;
 }
 
 void CSCLCoreImpl::fini()
@@ -76,8 +69,6 @@ void CSCLCoreImpl::fini()
 
     m_core_ui.fini();
     m_connection.fini();
-
-    m_initialized = FALSE;
 }
 
 void CSCLCoreImpl::set_core_event_callback(ISCLCoreEventCallback *callback)
@@ -106,11 +97,6 @@ sclchar* CSCLCoreImpl::get_uuid()
     return m_uuid;
 }
 
-sclchar* CSCLCoreImpl::get_display()
-{
-    return m_display;
-}
-
 void CSCLCoreImpl::config_reload()
 {
     m_connection.config_reload();
@@ -288,6 +274,9 @@ void CSCLCoreImpl::get_keyboard_ise(const sclchar *uuid)
 
 void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display)
 {
+    m_core_ui.init();
+    m_connection.init();
+
     LOGD("uuid : '%s', display : '%s'\n", uuid, display);
 
     if (uuid && strlen(uuid) > 0) {
@@ -313,9 +302,8 @@ void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display)
 
 void CSCLCoreImpl::run()
 {
-    if (!m_initialized) {
-        init(NULL);
-    }
+    m_core_ui.init();
+    m_connection.init();
 
     if (!m_uuid) {
         char *appid = NULL;
@@ -336,6 +324,9 @@ void CSCLCoreImpl::run()
     }
 
     m_core_ui.run(m_display);
+
+    m_connection.fini();
+    m_core_ui.fini();
 }
 
 sclwindow CSCLCoreImpl::get_main_window()