Use FindDevice to get device object path

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-device.c

diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c
index d2f939c..32297fc 100644 (file)
--- a/bt-service/bt-service-device.c
+++ b/bt-service/bt-service-device.c
@@ -674,18 +674,7 @@ static int __bt_remove_and_bond(void)
        adapter_proxy = _bt_get_adapter_proxy();
        retv_if(adapter_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       result = g_dbus_proxy_call_sync(adapter_proxy, "FindDevice",
-                               g_variant_new("(s)", bonding_info->addr),
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1,
-                               NULL,
-                               NULL);
-       if (result == NULL)
-               return BLUETOOTH_ERROR_INTERNAL;
-
-       g_variant_get(result , "(o)", &device_path);
-       g_variant_unref(result);
-
+       device_path = _bt_get_device_object_path(bonding_info->addr);
        retv_if(device_path == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        result = g_dbus_proxy_call_sync(adapter_proxy, "UnpairDevice",
@@ -695,12 +684,15 @@ static int __bt_remove_and_bond(void)
                                NULL,
                                &err);
        g_free(device_path);
-       if (err != NULL) {
-               BT_ERR("UnpairDevice Fail: %s", err->message);
-               g_error_free(err);
+       if (result == NULL) {
+               if (err != NULL) {
+                       BT_ERR("UnpairDevice Fail: %s", err->message);
+                       g_error_free(err);
+               }
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
+       g_variant_unref(result);
        return __bt_retry_bond();
 }