Change dialer to run as non-root using session bus on dbus

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/dialer/rc.c b/dialer/rc.c
index 061a627..d9898e4 100644 (file)
--- a/dialer/rc.c
+++ b/dialer/rc.c
@@ -360,17 +360,9 @@ Eina_Bool rc_init(const char *service)
                return EINA_FALSE;
        }
 
-#ifdef HAVE_TIZEN
-       /* NOTE: Tizen is stupid and does not have a session bus.  at
-        * least not for user "app". Moreover the dialer is started by
-        * user "root" :-(
-        */
-       INF("Running on System bus");
-       bus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
-#else
        INF("Running on Session bus");
        bus_conn = e_dbus_bus_get(DBUS_BUS_SESSION);
-#endif
+
        if (!bus_conn) {
                CRITICAL("Could not get DBus Bus");
                return EINA_FALSE;

diff --git a/messages/rc.c b/messages/rc.c
index 4c26ac9..99c9d7a 100644 (file)
--- a/messages/rc.c
+++ b/messages/rc.c
@@ -171,17 +171,9 @@ Eina_Bool rc_init(const char *service)
                return EINA_FALSE;
        }
 
-#ifdef HAVE_TIZEN
-       /* NOTE: Tizen is stupid and does not have a session bus.  at
-        * least not for user "app". Moreover the messages is started by
-        * user "root" :-(
-        */
-       INF("Running on System bus");
-       bus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
-#else
        INF("Running on Session bus");
        bus_conn = e_dbus_bus_get(DBUS_BUS_SESSION);
-#endif
+
        if (!bus_conn) {
                CRITICAL("Could not get DBus Bus");
                return EINA_FALSE;

diff --git a/tizen/answer_daemon.c b/tizen/answer_daemon.c
index 757621c..5bb6917 100644 (file)
--- a/tizen/answer_daemon.c
+++ b/tizen/answer_daemon.c
@@ -371,17 +371,8 @@ static Eina_Bool _dbus_init(Call_Screen *cs)
        DBusMessage *msg;
        char *bus_name = BUS_NAME;
 
-#ifdef HAVE_TIZEN
-       /* NOTE: Tizen is stupid and does not have a session bus.  at
-        * least not for user "app". Moreover the dialer is started by
-        * user "root" :-(
-        */
-       INF("Running on System bus");
-       bus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
-#else
        INF("Running on Session bus");
        bus_conn = e_dbus_bus_get(DBUS_BUS_SESSION);
-#endif
 
        if (!bus_conn) {
                ERR("Could not fetch the DBus session");

diff --git a/tizen/org.tizen.dialer.service.in b/tizen/org.tizen.dialer.service.in
index 4885278..2e8050a 100644 (file)
--- a/tizen/org.tizen.dialer.service.in
+++ b/tizen/org.tizen.dialer.service.in
@@ -1,4 +1,3 @@
 [D-BUS Service]
 Name=org.tizen.dialer
 Exec=@bindir@/dialer -t=hfp
-User=root