aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz-von@nokia.com>2011-03-23 17:42:07 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2011-03-24 11:13:23 +0200
commite3a27197820b503f16f39bf4071b65a4e5123b42 (patch)
treee430620c0f0bb1770455d899742c73e31cb3af55 /audio
parent015e26129674116dd697af2fb5386cb2568cabc8 (diff)
downloadbluez-e3a27197820b503f16f39bf4071b65a4e5123b42.tar.gz
telephony-ofono: fix handling of telephony_key_press_req
Diffstat (limited to 'audio')
-rw-r--r--audio/telephony-ofono.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
index ef4ede71..6f5685b6 100644
--- a/audio/telephony-ofono.c
+++ b/audio/telephony-ofono.c
@@ -579,19 +579,17 @@ void telephony_nr_and_ec_req(void *telephony_device, gboolean enable)
void telephony_key_press_req(void *telephony_device, const char *keys)
{
- struct voice_call *active, *waiting;
+ struct voice_call *active, *incoming;
int err;
DBG("telephony-ofono: got key press request for %s", keys);
- waiting = find_vc_with_status(CALL_STATUS_INCOMING);
- if (!waiting)
- waiting = find_vc_with_status(CALL_STATUS_DIALING);
+ incoming = find_vc_with_status(CALL_STATUS_INCOMING);
active = find_vc_with_status(CALL_STATUS_ACTIVE);
- if (waiting)
- err = answer_call(waiting);
+ if (incoming)
+ err = answer_call(incoming);
else if (active)
err = release_call(active);
else