X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-obex-server.c;h=4363a7e8813c2a96a93310af7d97dd562865f9eb;hb=e808cd1dcf0cc5e04b27b4900305fd77e19e5a3f;hp=af3001927095c6c98fbedc4979672e4b595df8e4;hpb=5eab5bddd990ec4fcaaa029e8fe712197e967160;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-service/bt-service-obex-server.c b/bt-service/bt-service-obex-server.c
index af30019..4363a7e 100644
--- a/bt-service/bt-service-obex-server.c
+++ b/bt-service/bt-service-obex-server.c
@@ -20,7 +20,7 @@
 #include <dlog.h>
 #include <string.h>
 #include <dirent.h>
-#ifdef TIZEN_FEATURE_BT_DPM
+#ifdef TIZEN_DPM_ENABLE
 #include "bt-service-dpm.h"
 #endif
 
@@ -407,7 +407,7 @@ static GDBusProxy *__bt_get_transfer_proxy(const char *transfer_path)
 	GDBusProxy *proxy;
 	GError *err = NULL;
 
-	conn = _bt_gdbus_get_system_gconn();
+	conn = _bt_gdbus_get_session_gconn();
 	retv_if(conn == NULL, NULL);
 
 	proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -430,7 +430,7 @@ static GDBusProxy *__bt_get_transfer_properties_proxy(const char *transfer_path)
 	GDBusConnection *conn;
 	GDBusProxy *proxy;
 	GError *err = NULL;
-	conn = _bt_gdbus_get_system_gconn();
+	conn = _bt_gdbus_get_session_gconn();
 	retv_if(conn == NULL, NULL);
 
 	proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -535,9 +535,6 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
 	GVariant *param = NULL;
 	GError *err = NULL;
 	bt_session_info_t *session_info = NULL;
-#ifdef TIZEN_FEATURE_BT_DPM
-	int value = DPM_BT_ERROR;
-#endif
 
 	BT_DBG(" path [%s] \n", path);
 
@@ -576,9 +573,8 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
 
 	agent_info.auth_info->transfer_path = g_strdup(path);
 
-#ifdef TIZEN_FEATURE_BT_DPM
-	_bt_dpm_get_allow_bluetooth_mode(&value);
-	if (value == DPM_BT_HANDSFREE_ONLY) {
+#ifdef TIZEN_DPM_ENABLE
+	if (_bt_dpm_get_allow_bluetooth_mode() == DPM_BT_HANDSFREE_ONLY) {
 		/* Free auth info in next function */
 		_bt_obex_server_reject_authorize();
 		return FALSE;
@@ -627,17 +623,16 @@ static gboolean __bt_authorize_cb(GDBusMethodInvocation *context,
 	}
 
 	if (session_info->authorized == FALSE) {
-		if (headed_plugin_info->plugin_headed_enabled)
-			headed_plugin_info->headed_plugin->bt_launch_system_popup(BT_AGENT_EVENT_EXCHANGE_REQUEST, device_name,
+		_bt_launch_system_popup(BT_AGENT_EVENT_EXCHANGE_REQUEST, device_name,
 					auth_info, NULL, NULL, BT_OBEX_SERVER_AGENT_PATH);
 	} else {
 		param = g_variant_new("(istss)", result,
-				agent_info.auth_info->filename,
-				agent_info.auth_info->file_size,
-				agent_info.auth_info->address,
-				agent_info.auth_info->device_name);
+			agent_info.auth_info->filename,
+			agent_info.auth_info->file_size,
+			agent_info.auth_info->address,
+			agent_info.auth_info->device_name);
 		_bt_send_event(BT_OPP_SERVER_EVENT,
-				BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_AUTHORIZE, param);
+			BLUETOOTH_EVENT_OBEX_SERVER_TRANSFER_AUTHORIZE, param);
 	}
 
 	return TRUE;
@@ -816,9 +811,9 @@ void _bt_obex_transfer_completed(const char *transfer_path, gboolean success)
 			g_variant_builder_add(builder, "y", agent_info.auth_info->contact_auth_info[i]);
 
 		param = g_variant_new("(isssstii(ay))", result,
-					transfer_info->device_name,
 					transfer_info->filename,
 					transfer_info->type,
+					transfer_info->device_name,
 					transfer_info->address,
 					transfer_info->file_size,
 					transfer_info->transfer_id,
@@ -904,7 +899,7 @@ int _bt_register_obex_server(void)
 	GError *g_error = NULL;
 
 	/* Get the session bus. */
-	g_conn = _bt_gdbus_get_system_gconn();
+	g_conn = _bt_gdbus_get_session_gconn();
 	retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
 	_bt_obex_agent_new(BT_OBEX_SERVER_AGENT_PATH);