>>From 6a3a4f1229728754e01f3bc7911c3d508348a56f Mon Sep 17 00:00:00 2001 From: Fabien Chevalier Date: Sat, 13 Sep 2008 17:14:34 +0200 Subject: [PATCH] Error value fixes. In case the HSP/HFP headset is down, we return "not supported" : this is non-sense : change that to connection attempt failed --- audio/headset.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/audio/headset.c b/audio/headset.c index 102d0bc..45bcf34 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -1074,7 +1074,9 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data) if (err < 0) { error("Unable to get service record: %s (%d)", strerror(-err), -err); - goto failed_not_supported; + error_connection_attempt_failed(dev->conn, p->msg, p->err); + + goto failed; } if (!recs || !recs->data) { @@ -1140,10 +1142,13 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data) failed_not_supported: if (p->msg) { error_not_supported(dev->conn, p->msg); + } +failed: + if (p->msg) { dbus_message_unref(p->msg); p->msg = NULL; } -failed: + if (classes) sdp_list_free(classes, free); pending_connect_finalize(dev); -- 1.5.6.5