From: Jo?o Paulo Rechi Vita <jprvita@xxxxxxxxxxxxx>
---
src/modules/bluetooth/bluez5-util.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 762d1e4..35b8774 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -78,8 +78,27 @@ struct pa_bluetooth_discovery {
pa_hook hooks[PA_BLUETOOTH_HOOK_MAX];
pa_hashmap *devices;
pa_hashmap *transports;
+
+ PA_LLIST_HEAD(pa_dbus_pending, pending);
};
+static pa_dbus_pending* pa_bluetooth_dbus_send_and_add_to_pending(pa_bluetooth_discovery *y, DBusMessage *m,
+ DBusPendingCallNotifyFunction func, void *call_data) {
+ pa_dbus_pending *p;
+ DBusPendingCall *call;
+
+ pa_assert(y);
+ pa_assert(m);
+
+ pa_assert_se(dbus_connection_send_with_reply(pa_dbus_connection_get(y->connection), m, &call, -1));
+
+ p = pa_dbus_pending_new(pa_dbus_connection_get(y->connection), m, call, y, call_data);
+ PA_LLIST_PREPEND(pa_dbus_pending, y->pending, p);
+ dbus_pending_call_set_notify(call, func, p, NULL);
+
+ return p;
+}
+
pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const char *owner, const char *path,
pa_bluetooth_profile_t p, const uint8_t *config, int size,
pa_bluetooth_transport_acquire_cb acquire,
@@ -755,6 +774,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
y->core = c;
y->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
y->transports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ PA_LLIST_HEAD_INIT(pa_dbus_pending, y->pending);
for (i = 0; i < PA_BLUETOOTH_HOOK_MAX; i++)
pa_hook_init(&y->hooks[i], y);
@@ -813,6 +833,8 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
if (PA_REFCNT_DEC(y) > 0)
return;
+ pa_dbus_free_pending_list(&y->pending);
+
if (y->devices) {
pa_bluetooth_discovery_remove_all_devices(y);
pa_hashmap_free(y->devices, NULL);
--
1.7.11.7
