telephony-service

Merge lp:~seb128/telephony-service/dialpad-nosound-silentmode into lp:telephony-service

  1. dialpad-nosound-silentmode
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-06-01
Status: Superseded
Proposed branch: lp:~seb128/telephony-service/dialpad-nosound-silentmode
Merge into: lp:telephony-service
Diff against target: 13 lines (+2/-1)
1 file modified
handler/callhandler.cpp (+2/-1)
To merge this branch: bzr merge lp:~seb128/telephony-service/dialpad-nosound-silentmode
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) 2015-06-01 Approve on 2015-06-22
PS Jenkins bot continuous-integration Approve on 2015-06-09
Review via email: mp+260731@code.launchpad.net

This proposal has been superseded by a proposal from 2015-07-06.

Commit Message

Don't play keypad sounds in silentmode

Description of the Change

Don't play keypad sounds in silentmode

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gustavo Pichorim Boiko (boiko) wrote :

Looks good and works as expected!

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'handler/callhandler.cpp'
2--- handler/callhandler.cpp 2015-03-04 18:02:13 +0000
3+++ handler/callhandler.cpp 2015-06-01 15:23:31 +0000
4@@ -177,7 +177,8 @@
5 * play locally (via tone generator) only if we are on a call, or if this is
6 * dialpad sounds
7 */
8- if (GreeterContacts::instance()->dialpadSoundsEnabled() && objectPath.isEmpty()
9+ if (GreeterContacts::instance()->dialpadSoundsEnabled() &&
10+ !GreeterContacts::instance()->silentMode() && objectPath.isEmpty()
11 || !objectPath.isEmpty()) {
12 ToneGenerator::instance()->playDTMFTone((uint)event);
13 }

Subscribers

People subscribed via source and target branches