diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-10 01:11:01 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-10 01:11:01 +0200 |
| commit | 14dd201d51b5044160247bd045e7692cfa5efc5b (patch) | |
| tree | e40ab912fb6310495dd4873bf602ab77695d7766 /audio | |
| parent | 303db2fca1008b15f3411643ed64a7d612597328 (diff) | |
| parent | e9e2f58c0c6f8a028068b66362d413357df58f12 (diff) | |
Merge branch 'devel' of git://git.infradead.org/users/vcgomes/bluez
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/avdtp.c | 5 | ||||
| -rw-r--r-- | audio/control.c | 4 | ||||
| -rw-r--r-- | audio/manager.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c index b052b927..592322f8 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -2715,11 +2715,6 @@ static void auth_cb(DBusError *derr, void *user_data) if (derr && dbus_error_is_set(derr)) { error("Access denied: %s", derr->message); - if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) { - debug("Canceling authorization request"); - btd_cancel_authorization(&session->server->src, - &session->dst); - } connection_lost(session, -EACCES); return; diff --git a/audio/control.c b/audio/control.c index 15e38c99..4792b4ba 100644 --- a/audio/control.c +++ b/audio/control.c @@ -630,10 +630,6 @@ static void auth_cb(DBusError *derr, void *user_data) if (derr && dbus_error_is_set(derr)) { error("Access denied: %s", derr->message); - if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) { - debug("Canceling authorization request"); - btd_cancel_authorization(&session->src, &session->dst); - } avctp_unref(session); return; diff --git a/audio/manager.c b/audio/manager.c index deeb375c..5af175c3 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -455,10 +455,6 @@ static void auth_cb(DBusError *derr, void *user_data) if (derr && dbus_error_is_set(derr)) { error("Access denied: %s", derr->message); - if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) { - debug("Canceling authorization request"); - btd_cancel_authorization(&device->src, &device->dst); - } headset_set_state(device, HEADSET_STATE_DISCONNECTED); } else { |