return BLUETOOTH_ERROR_NONE;
}
-static char *__bt_extract_device_path(GVariantIter *iter, char *address)
-{
- char *object_path = NULL;
- char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
-
- /* Parse the signature: oa{sa{sv}}} */
- while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path,
- NULL)) {
- if (!object_path) {
- BT_ERR("Unable to get object path");
- return NULL;
- }
- _bt_convert_device_path_to_address(object_path, device_address);
- if (g_strcmp0(address, device_address) == 0)
- return g_strdup(object_path);
-
- }
-
- BT_ERR("Unable to get object path");
- return NULL;
-}
-
char *_bt_get_device_object_path(char *address)
{
char *object_path = NULL;
- GDBusConnection *conn;
- GDBusProxy *manager_proxy;
GVariant *result = NULL;
- GVariantIter *iter = NULL;
-
- conn = _bt_gdbus_get_system_gconn();
- retv_if(conn == NULL, NULL);
+ GDBusProxy *proxy;
+ GError *error = NULL;
- manager_proxy = _bt_get_manager_proxy();
- retv_if(manager_proxy == NULL, NULL);
+ proxy = _bt_get_adapter_proxy();
+ retv_if(proxy == NULL, NULL);
- result = g_dbus_proxy_call_sync(manager_proxy, "GetManagedObjects",
- NULL,
+ result = g_dbus_proxy_call_sync(proxy, "FindDevice",
+ g_variant_new("(s)", address),
G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- NULL);
- if (!result) {
- BT_ERR("Can't get managed objects");
+ -1, NULL, &error);
+ if (result == NULL) {
+ if (error) {
+ BT_ERR("FindDevice Fail: %s", error->message);
+ g_clear_error(&error);
+ }
return NULL;
}
- /* signature of GetManagedObjects: a{oa{sa{sv}}} */
- g_variant_get(result, "(a{oa{sa{sv}}})", &iter);
- object_path = __bt_extract_device_path(iter, address);
- g_variant_iter_free(iter);
+ g_variant_get(result, "(o)", &object_path);
+
g_variant_unref(result);
return object_path;
}