From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Tue, 17 May 2016 01:12:47 +0000 (+0900)
Subject: Revert "Remove dbus-glib-1 dependency"
X-Git-Tag: accepted/tizen/common/20160517.174237~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfab186a4adb673276d81af05f857c7d3323c8bd;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-share.git

Revert "Remove dbus-glib-1 dependency"

This reverts commit ab31110f7b6450c944001581d8525739a163e24c.

Change-Id: I779cb2bd8cb126fb52346e9ed51593329a063a9d
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/bt-share/CMakeLists.txt b/bt-share/CMakeLists.txt
index 39f8504..fc45835 100644
--- a/bt-share/CMakeLists.txt
+++ b/bt-share/CMakeLists.txt
@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED glib-2.0 bluetooth-api
-				aul appcore-common
+				aul dbus-glib-1 appcore-common
 				dlog vconf syspopup-caller deviced
 				notification sqlite3 ecore-file
 				appsvc appcore-efl storage
diff --git a/bt-share/src/bt-share-ipc.c b/bt-share/src/bt-share-ipc.c
index ec05b5f..0afbea9 100644
--- a/bt-share/src/bt-share-ipc.c
+++ b/bt-share/src/bt-share-ipc.c
@@ -17,6 +17,8 @@
  *
  */
 
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib.h>
 #include <dbus/dbus.h>
 #include <glib.h>
 #include <time.h>
@@ -419,22 +421,20 @@ static DBusHandlerResult __event_filter(DBusConnection *sys_conn,
 gboolean _bt_init_dbus_signal(void)
 {
 	DBG("+");
+	DBusGConnection *conn;
+	GError *err = NULL;
 	DBusError dbus_error;
 
-	dbus_error_init(&dbus_error);
-
-	dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error);
-
-	if (!dbus_connection) {
+	conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &err);
+	if (!conn) {
 		ERR(" DBUS get failed");
-		if (dbus_error_is_set(&dbus_error)) {
-			ERR("D-Bus Error: %s\n", dbus_error.message);
-			dbus_error_free(&dbus_error);
-		}
+		g_error_free(err);
 		return FALSE;
 	}
+	dbus_connection = dbus_g_connection_get_connection(conn);
 
 	/* Add the filter for network client functions */
+	dbus_error_init(&dbus_error);
 	dbus_connection_add_filter(dbus_connection, __event_filter, NULL, NULL);
 	dbus_bus_add_match(dbus_connection,
 			"type=signal,interface=" BT_BLUEZ_INTERFACE