Merge lp:~boiko/telepathy-ofono/set_accepted_status into lp:telepathy-ofono/rtm-15.04

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 146
Merged at revision: 147
Proposed branch: lp:~boiko/telepathy-ofono/set_accepted_status
Merge into: lp:telepathy-ofono/rtm-15.04
Diff against target: 18 lines (+8/-0)
1 file modified
ofonocallchannel.cpp (+8/-0)
To merge this branch: bzr merge lp:~boiko/telepathy-ofono/set_accepted_status
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
Review via email: mp+263727@code.launchpad.net

Commit message

Set the status to accepted once a call is accepted.

Description of the change

Set the status to accepted once a call is accepted.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

To post a comment you must log in.
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

Looks good.

--Checklist--
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
CI is not configured for the targeted branch.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ofonocallchannel.cpp'
2--- ofonocallchannel.cpp 2015-02-17 17:03:42 +0000
3+++ ofonocallchannel.cpp 2015-07-02 21:38:44 +0000
4@@ -125,6 +125,14 @@
5
6 void oFonoCallChannel::onAccept(Tp::DBusError*)
7 {
8+ QVariantMap stateDetails;
9+ Tp::CallStateReason reason;
10+ reason.actor = 0;
11+ reason.reason = Tp::CallStateChangeReasonUserRequested;
12+ reason.message = "";
13+ reason.DBusReason = "";
14+ mCallChannel->setCallState(Tp::CallStateAccepted, 0, reason, stateDetails);
15+
16 if (this->state() == "waiting") {
17 mConnection->voiceCallManager()->holdAndAnswer();
18 } else {

Subscribers

People subscribed via source and target branches