summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-hci.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-03 15:01:00 -0300
committerLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-28 10:32:38 -0300
commitd3ea4d9816ddbc3ee0ea6ad44cd130cb646a3a61 (patch)
tree2da740983cde17b874ef5bd9914e253f9e3ac983 /hcid/dbus-hci.c
parentd98c43ee61b7b0f7009cad6b87ccbe13252085e0 (diff)
Remove pending disconnect from adapter.c.
Diffstat (limited to 'hcid/dbus-hci.c')
-rw-r--r--hcid/dbus-hci.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index d18ca1c6..b4891c22 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -426,14 +426,6 @@ int unregister_adapter_path(const char *path)
adapter->active_conn = NULL;
}
- /* Check if there is a pending RemoteDeviceDisconnect request */
- if (adapter->pending_dc) {
- error_no_such_adapter(adapter->pending_dc->conn,
- adapter->pending_dc->msg);
- g_source_remove(adapter->pending_dc->timeout_id);
- dc_pending_timeout_cleanup(adapter);
- }
-
if (adapter->devices) {
g_slist_foreach(adapter->devices, do_unregister,
connection);
@@ -1866,19 +1858,6 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status,
adapter->bonding = NULL;
}
- /* Check if there is a pending RemoteDeviceDisconnect request */
- if (adapter->pending_dc) {
- reply = dbus_message_new_method_return(adapter->pending_dc->msg);
- if (reply) {
- dbus_connection_send(connection, reply, NULL);
- dbus_message_unref(reply);
- } else
- error("Failed to allocate disconnect reply");
-
- g_source_remove(adapter->pending_dc->timeout_id);
- dc_pending_timeout_cleanup(adapter);
- }
-
adapter->active_conn = g_slist_remove(adapter->active_conn, dev);
g_free(dev);