Change uid and gid for service files

[platform/core/uifw/tts.git] / client / tts_dbus.c

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index caa4e39..0c60f4a 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -23,7 +23,7 @@
 #include "tts_main.h"
 #include "tts_internal.h"
 
-#define HELLO_WAITING_TIME 500
+#define HELLO_WAITING_TIME -1
 #define WAITING_TIME 5000
 
 static DBusConnection* g_conn_sender = NULL;
@@ -158,10 +158,12 @@ static void __tts_dbus_connection_free()
 {
        if (NULL != g_conn_listener) {
                dbus_connection_close(g_conn_listener);
+               dbus_connection_unref(g_conn_listener);
                g_conn_listener = NULL;
        }
        if (NULL != g_conn_sender) {
                dbus_connection_close(g_conn_sender);
+               dbus_connection_unref(g_conn_sender);
                g_conn_sender = NULL;
        }
 }
@@ -175,11 +177,11 @@ int tts_dbus_open_connection()
 
        DBusError err;
 
-       /* initialise the error value */
+       /* initialize the error value */
        dbus_error_init(&err);
 
        /* connect to the DBUS system bus, and check for errors */
-       g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+       g_conn_sender = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
        if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Dbus Connection Error (%s)", err.message);
                dbus_error_free(&err);
@@ -192,7 +194,7 @@ int tts_dbus_open_connection()
 
        dbus_connection_set_exit_on_disconnect(g_conn_sender, false);
 
-       g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+       g_conn_listener = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
        if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Dbus Connection Error (%s)", err.message);
                dbus_error_free(&err);
@@ -299,27 +301,27 @@ DBusMessage* __tts_dbus_make_message(int uid, const char* method)
 
        if (TTS_MODE_DEFAULT == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_SERVER_SERVICE_NAME, 
-                       TTS_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_SERVER_SERVICE_INTERFACE, 
+                       TTS_SERVER_SERVICE_NAME,
+                       TTS_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_SERVER_SERVICE_INTERFACE,
                        method);
        } else if (TTS_MODE_NOTIFICATION == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_NOTI_SERVER_SERVICE_NAME, 
-                       TTS_NOTI_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_NOTI_SERVER_SERVICE_INTERFACE, 
+                       TTS_NOTI_SERVER_SERVICE_NAME,
+                       TTS_NOTI_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_NOTI_SERVER_SERVICE_INTERFACE,
                        method);
        } else if (TTS_MODE_SCREEN_READER == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_SR_SERVER_SERVICE_NAME, 
-                       TTS_SR_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_SR_SERVER_SERVICE_INTERFACE, 
+                       TTS_SR_SERVER_SERVICE_NAME,
+                       TTS_SR_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_SR_SERVER_SERVICE_INTERFACE,
                        method);
        } else if (TTS_MODE_INTERRUPT == client->mode) {
                msg = dbus_message_new_method_call(
-                       TTS_INTERRUPT_SERVER_SERVICE_NAME, 
-                       TTS_INTERRUPT_SERVER_SERVICE_OBJECT_PATH, 
-                       TTS_INTERRUPT_SERVER_SERVICE_INTERFACE, 
+                       TTS_INTERRUPT_SERVER_SERVICE_NAME,
+                       TTS_INTERRUPT_SERVER_SERVICE_OBJECT_PATH,
+                       TTS_INTERRUPT_SERVER_SERVICE_INTERFACE,
                        method);
        } else {
                SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Input mode is not available");
@@ -353,7 +355,7 @@ int tts_dbus_request_hello(int uid)
        result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, HELLO_WAITING_TIME, &err);
        dbus_message_unref(msg);
        if (dbus_error_is_set(&err)) {
-               SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err);
+               SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err.message);
                dbus_error_free(&err);
        }
 
@@ -960,6 +962,7 @@ int tts_dbus_request_pause(int uid)
        return result;
 }
 
+//LCOV_EXCL_START
 int tts_dbus_request_play_pcm(int uid)
 {
        DBusMessage* msg;
@@ -1141,3 +1144,4 @@ int tts_dbus_request_add_pcm(int uid, int event, const char* data, int data_size
 
        return result;
 }
+// LCOV_EXCL_STOP