Disconnection dbus relationship

Change-Id: Ia8bfdf75fb6b8aad8bbcd49968e3185434cdfe1e
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c269a11b3758d905f8cfa942e67d3cff4c5951d8..2cda6604b4d6ac2ef434b74c90d8259980ebb07d 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -9,8 +9,8 @@ SET(SRCS
        vcd_client_data.c
        vcd_server_data.cpp
        vcd_config.c
-       vcd_dbus_server.c
-       vcd_dbus.c
+#      vcd_dbus_server.c
+#      vcd_dbus.c
        vcd_tidl.c
        vcd_stub.c
        vcd_mgr_stub.c

diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c
index a00d8bc5acbfa35ddb319819d994d56f4ffc2b58..29b6d750802aeda9a45f5ffe85a44dd06440be8a 100755 (executable)
--- a/server/vcd_dbus.c
+++ b/server/vcd_dbus.c
@@ -16,8 +16,8 @@
 
 #include <dbus/dbus.h>
 #include "vcd_client_data.h"
-#include "vcd_dbus.h"
-#include "vcd_dbus_server.h"
+// #include "vcd_dbus.h"
+// #include "vcd_dbus_server.h"
 #include "vcd_tidl.h"
 #include "vcd_main.h"
 

diff --git a/server/vcd_dbus.h b/server/vcd_dbus.h
index c4c4ad9ebf945a868a4439723eed529b93fd670c..88fd97448a8d06e1340ac647504d92a3f6e58ecd 100644 (file)
--- a/server/vcd_dbus.h
+++ b/server/vcd_dbus.h
@@ -30,14 +30,6 @@ int vcd_dbus_close_connection();
 
 int vcd_check_dbus_connection();
 
-// int vcdc_send_error_signal(int reason, char *err_msg);      // No call in anywhere..
-
-//int vcdc_send_error_signal_to_app(int pid, int reason, char *err_msg);
-
-// int vcdc_send_manager_pid(int manager_pid);
-
-/* for TTS feedback */
-//int vcdc_send_feedback_streaming(int pid, int utt_id, vc_feedback_event_e event, char* buffer, int len);
 
 #ifdef __cplusplus
 }

diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c
index d5d4ac1c487373b19506ddb4661898fabfbc41fb..45561026510cd03c6c983053dfe4aba7e1aa1730 100755 (executable)
--- a/server/vcd_dbus_server.c
+++ b/server/vcd_dbus_server.c
@@ -16,9 +16,9 @@
 
 
 #include "vcd_client_data.h"
-#include "vcd_dbus.h"
+// #include "vcd_dbus.h"
 #include "vcd_tidl.h"
-#include "vcd_dbus_server.h"
+// #include "vcd_dbus_server.h"
 #include "vcd_main.h"
 #include "vcd_server.h"
 #include "vcd_config.h"

diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c
index 6e45a4df06ae3dd5b3ab3d193af9a2ce657d3884..7b89164363542b79c138b02617c31d2aefb4fd22 100644 (file)
--- a/server/vcd_engine_agent.c
+++ b/server/vcd_engine_agent.c
@@ -23,7 +23,7 @@
 #include "vcd_engine_agent.h"
 #include "vcd_main.h"
 #include "vcd_recorder.h"
-#include "vcd_dbus.h"
+// #include "vcd_dbus.h"
 #include "vcd_tidl.h"
 #include "vce_internal.h"
 

diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c
index 9c4845f74de2af84935dbb1379053c8435a92c2f..0dd139459534e59c0895b7fe5120862f98cf4bdb 100644 (file)
--- a/server/vcd_recorder.c
+++ b/server/vcd_recorder.c
@@ -21,7 +21,6 @@
 
 #include "vcd_client_data.h"
 #include "vcd_config.h"
-#include "vcd_dbus.h"
 #include "vcd_tidl.h"
 #include "vcd_engine_agent.h"
 #include "vcd_recorder.h"

diff --git a/server/vcd_server.c b/server/vcd_server.c
index ae3653117f6a0c8f7a1b69cb4e1a44f02c138fd3..a9becebe8e371a5808bcc7be75724dac3786468e 100644 (file)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -28,7 +28,7 @@
 #include "vcd_engine_agent.h"
 #include "vcd_config.h"
 #include "vcd_recorder.h"
-#include "vcd_dbus.h"
+// #include "vcd_dbus.h"
 #include "vcd_tidl.h"
 #include "vce_internal.h"
 
@@ -1341,13 +1341,14 @@ int vcd_initialize(vce_request_callback_s *callback)
 
 //     if (TRUE == __is_default_engine()) {
                /* Open dbus connection */
-               if (0 != vcd_dbus_open_connection()) {
-                       SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to open connection");
-                       if (TRUE != vcd_finalize()) {
-                               SLOG(LOG_ERROR, TAG_VCD, "[Server Error] Fail to finalize");
-                       }
-                       return VCD_ERROR_OPERATION_FAILED;
-               }
+               // TODO: remove
+               // if (0 != vcd_dbus_open_connection()) {
+               //      SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to open connection");
+               //      if (TRUE != vcd_finalize()) {
+               //              SLOG(LOG_ERROR, TAG_VCD, "[Server Error] Fail to finalize");
+               //      }
+               //      return VCD_ERROR_OPERATION_FAILED;
+               // }
 
                /* Open tidl connection */
                if (0 != vcd_tidl_open_connection()) {
@@ -1437,9 +1438,10 @@ bool vcd_finalize()
        }
 
        /* Close dbus connection */
-       if (0 != vcd_dbus_close_connection()) {
-               SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to close connection");
-       }
+       // TODO: remove
+       // if (0 != vcd_dbus_close_connection()) {
+       //      SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to close connection");
+       // }
 
        /* Close tidl connection */
        if (0 != vcd_tidl_close_connection()) {

diff --git a/server/vce.c b/server/vce.c
index 5353ea052197544432982d8661943565bf45726c..e4b359b9a75d97d548baecc1756b52af2a2de38a 100644 (file)
--- a/server/vce.c
+++ b/server/vce.c
@@ -19,7 +19,7 @@
 #include <cynara-error.h>
 #include <cynara-session.h>
 #include <system_info.h>
-#include "vcd_dbus.h"
+// #include "vcd_dbus.h"
 #include "vcd_tidl.h"
 #include "vcd_main.h"
 #include "vcd_server.h"