Revert "Modify the bt-service label from system to user"

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-common.c

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index 548d52c..515d4ce 100644 (file)
--- a/bt-api/bt-common.c
+++ b/bt-api/bt-common.c
@@ -49,8 +49,6 @@ static GDBusConnection *system_gdbus_conn = NULL;
 static guint bus_id;
 
 static GDBusConnection *system_gconn = NULL;
-static GDBusConnection *session_gconn = NULL;
-
 
 #define DBUS_TIMEOUT 20 * 1000 /* 20 Seconds */
 
@@ -86,38 +84,6 @@ GDBusConnection *g_bus_get_private_conn(void)
        return private_gconn;
 }
 
-GDBusConnection *g_bus_get_private_session_conn(void)
-{
-       GError *error = NULL;
-       char *address;
-       GDBusConnection *private_gconn = NULL;
-
-       address = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SESSION, NULL, &error);
-       if (address == NULL) {
-               if (error) {
-                       BT_ERR("Failed to get bus address: %s", error->message);
-                       g_clear_error(&error);
-               }
-               return NULL;
-       }
-
-       private_gconn = g_dbus_connection_new_for_address_sync(address,
-                               G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-                               G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
-                               NULL, /* GDBusAuthObserver */
-                               NULL,
-                               &error);
-       if (!private_gconn) {
-               if (error) {
-                       BT_ERR("Unable to connect to dbus: %s", error->message);
-                       g_clear_error(&error);
-               }
-               return NULL;
-       }
-
-       return private_gconn;
-}
-
 GDBusConnection *_bt_gdbus_init_system_gconn(void)
 {
        dbus_threads_init_default();
@@ -130,18 +96,6 @@ GDBusConnection *_bt_gdbus_init_system_gconn(void)
        return system_gconn;
 }
 
-GDBusConnection *_bt_gdbus_init_session_gconn(void)
-{
-       dbus_threads_init_default();
-
-       if (session_gconn != NULL)
-               return session_gconn;
-
-       session_gconn = g_bus_get_private_session_conn();
-
-       return session_gconn;
-}
-
 GDBusConnection *_bt_gdbus_get_system_gconn(void)
 {
 
@@ -155,20 +109,6 @@ GDBusConnection *_bt_gdbus_get_system_gconn(void)
        return system_gconn;
 }
 
-GDBusConnection *_bt_gdbus_get_session_gconn(void)
-{
-
-
-       if (session_gconn == NULL) {
-               session_gconn = _bt_gdbus_init_session_gconn();
-       } else if (g_dbus_connection_is_closed(session_gconn)) {
-               session_gconn = g_bus_get_private_session_conn();
-       }
-
-       return session_gconn;
-}
-
-
 void _bt_print_device_address_t(const bluetooth_device_address_t *addr)
 {
        BT_DBG("%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n", addr->addr[0], addr->addr[1], addr->addr[2],
@@ -1720,11 +1660,6 @@ BT_EXPORT_API int bluetooth_unregister_callback(void)
                g_object_unref(system_gconn);
                system_gconn = NULL;
        }
-
-       if (session_gconn) {
-               g_object_unref(session_gconn);
-               session_gconn = NULL;
-       }
        return BLUETOOTH_ERROR_NONE;
 }