summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-01-08 15:30:23 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2009-01-08 15:30:23 +0200
commit9b0aa29bcf827f24658edec61065e42d24692028 (patch)
tree0a7d751d1e08e438a4788b93c9a39a15b6efca33 /audio
parent5ea0f5e65c4307aadb797851388f5f5a2583717c (diff)
Catch errors properly in telephony_call_hold_req
Diffstat (limited to 'audio')
-rw-r--r--audio/telephony-maemo.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/audio/telephony-maemo.c b/audio/telephony-maemo.c
index 7daed665..593fe36b 100644
--- a/audio/telephony-maemo.c
+++ b/audio/telephony-maemo.c
@@ -765,13 +765,12 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd)
foreach_call_with_status(CSD_CALL_STATUS_ACTIVE, release_call);
call = find_call_with_status(CSD_CALL_STATUS_WAITING);
if (call)
- answer_call(call);
+ err = answer_call(call);
break;
case '2':
if (idx) {
if (call)
err = split_call(call);
- break;
} else {
struct csd_call *held, *wait;
@@ -780,21 +779,21 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd)
wait = find_call_with_status(CSD_CALL_STATUS_WAITING);
if (call && (held || wait))
- swap_calls();
+ err = swap_calls();
else {
if (call)
- hold_call(call);
+ err = hold_call(call);
if (held)
- unhold_call(held);
+ err = unhold_call(held);
if (wait)
- answer_call(wait);
+ err = answer_call(wait);
}
}
break;
case '3':
call = find_call_with_status(CSD_CALL_STATUS_HOLD);
if (call)
- create_conference();
+ err = create_conference();
break;
case '4':
err = call_transfer();