summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-04-17 13:55:27 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-04-17 13:55:27 +0000
commit77c58d8b6b0c63b8dc2201dfd9019e7f824e63e5 (patch)
tree76752e33f5ff10b59991e1013a25b63621b99b32 /audio
parentf14786d7146e71d34c72057595eeb90ff7feee01 (diff)
Only stop indicating a call if the answer button is pressed (not e.g. if the volume button is pressed)
Diffstat (limited to 'audio')
-rw-r--r--audio/headset.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/headset.c b/audio/headset.c
index b1aad63d..4a7e8db4 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -408,6 +408,11 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond,
break;
case HEADSET_EVENT_KEYPRESS:
+ if (hs->ring_timer) {
+ g_source_remove(hs->ring_timer);
+ hs->ring_timer = 0;
+ }
+
hs_signal(hs, "AnswerRequested");
break;
@@ -438,11 +443,6 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond,
hs->data_start = 0;
}
- if (hs->ring_timer) {
- g_source_remove(hs->ring_timer);
- hs->ring_timer = 0;
- }
-
return TRUE;
failed: