From 8983a50e77f411af14f0cbfcc50f64bfec035c86 Mon Sep 17 00:00:00 2001
From: "ky85.kim" <ky85.kim@samsung.com>
Date: Tue, 12 Apr 2016 13:15:02 +0900
Subject: [PATCH] Apply session dbus and Remove uid in dbus service file

Change-Id: Ic2e1ef9485896c6023bca538c533e1d1ddc6cfe8
Signed-off-by: ky85.kim <ky85.kim@samsung.com>
---
 CMakeLists.txt                        | 6 +++---
 client/tts_dbus.c                     | 4 ++--
 org.tizen.voice.ttsnotiserver.service | 2 --
 org.tizen.voice.ttsserver.service     | 2 --
 org.tizen.voice.ttssrserver.service   | 2 --
 packaging/tts.spec                    | 2 +-
 server/ttsd_dbus.c                    | 4 ++--
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c184670..b2cd84d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,9 +59,9 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.conf DESTINATION /etc/dbus-1/system.d)
 
 ## Dbus service ##
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsnotiserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttssrserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsnotiserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttssrserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 
 ## Sample application ##
 ADD_SUBDIRECTORY(test)
diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index b6fe537..ffe5742 100644
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -151,7 +151,7 @@ int tts_dbus_open_connection()
 	dbus_error_init(&err);
 
 	/* connect to the DBUS system bus, and check for errors */
-	g_conn_sender = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
+	g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Dbus Connection Error (%s)", err.message);
 		dbus_error_free(&err);
@@ -164,7 +164,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_SYSTEM, &err);
+	g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Dbus Connection Error (%s)", err.message);
 		dbus_error_free(&err);
diff --git a/org.tizen.voice.ttsnotiserver.service b/org.tizen.voice.ttsnotiserver.service
index 6ad4436..65f9944 100644
--- a/org.tizen.voice.ttsnotiserver.service
+++ b/org.tizen.voice.ttsnotiserver.service
@@ -1,6 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.voice.ttsnotiserver
 Exec=/usr/bin/tts-daemon-noti
-User=root
-Group=root
 
diff --git a/org.tizen.voice.ttsserver.service b/org.tizen.voice.ttsserver.service
index cc70394..ff59c82 100644
--- a/org.tizen.voice.ttsserver.service
+++ b/org.tizen.voice.ttsserver.service
@@ -1,5 +1,3 @@
 [D-BUS Service]
 Name=org.tizen.voice.ttsserver
 Exec=/usr/bin/tts-daemon
-User=root
-Group=root
diff --git a/org.tizen.voice.ttssrserver.service b/org.tizen.voice.ttssrserver.service
index ea2d6fa..427b7e5 100644
--- a/org.tizen.voice.ttssrserver.service
+++ b/org.tizen.voice.ttssrserver.service
@@ -1,6 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.voice.ttssrserver
 Exec=/usr/bin/tts-daemon-sr
-User=root
-Group=root
 
diff --git a/packaging/tts.spec b/packaging/tts.spec
index eecef87..45cf33f 100644
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -95,7 +95,7 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test
 %{_libdir}/lib*.so
 %{_bindir}/tts-daemon*
 %{TZ_SYS_RO_SHARE}/voice/tts/1.0/tts-config.xml
-%{TZ_SYS_RO_SHARE}/dbus-1/system-services/org.tizen.voice*
+%{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice*
 %{TZ_SYS_RO_SHARE}/voice/test/tts-test
 %{TZ_SYS_RO_SHARE}/license/%{name}
 /etc/dbus-1/system.d/tts-server.conf
diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c
index 7ada226..3702575 100644
--- a/server/ttsd_dbus.c
+++ b/server/ttsd_dbus.c
@@ -278,7 +278,7 @@ int ttsd_dbus_open_connection()
 	int ret;
 
 	/* Create connection for sender */
-	g_conn_sender = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
+	g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, get_tag(), "[Dbus ERROR] Fail dbus_bus_get : %s", err.message);
 		dbus_error_free(&err);
@@ -290,7 +290,7 @@ int ttsd_dbus_open_connection()
 	}
 
 	/* connect to the bus and check for errors */
-	g_conn_listener = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
+	g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, get_tag(), "[Dbus ERROR] Fail dbus_bus_get : %s", err.message);
 		dbus_error_free(&err);
-- 
2.7.4