From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 10 Jul 2013 11:45:34 +0000 (+0300)
Subject: core: Use g_dbus_send_reply over dbus_message_new_method_return
X-Git-Tag: android-x86-4.4-r3~7907
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e339d0b6e55b529fa2584cb217088b61c890e1ad;p=android-x86%2Fexternal-bluetooth-bluez.git

core: Use g_dbus_send_reply over dbus_message_new_method_return
---

diff --git a/src/device.c b/src/device.c
index 7a6d9ec1d..4306d65d4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1453,8 +1453,7 @@ static void device_svc_resolved(struct btd_device *dev, int err)
 
 	if (dbus_message_is_method_call(req->msg, DEVICE_INTERFACE,
 								"Pair")) {
-		reply = dbus_message_new_method_return(req->msg);
-		g_dbus_send_message(dbus_conn, reply);
+		g_dbus_send_reply(dbus_conn, req->msg, DBUS_TYPE_INVALID);
 		return;
 	}
 
@@ -3716,13 +3715,8 @@ void device_bonding_complete(struct btd_device *device, uint8_t status)
 	 * request
 	 */
 	if (device->svc_resolved && bonding) {
-		DBusMessage *reply;
-
-		reply = dbus_message_new_method_return(bonding->msg);
-		g_dbus_send_message(dbus_conn, reply);
-
+		g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
 		bonding_request_free(bonding);
-
 		return;
 	}