Merge lp:~boiko/telephony-service/fix_call_earlier into lp:telephony-service

[Gustavo Pichorim Boiko]

Do not use the TelepathyHelper::accounts(), and use the ::accountIds() instead as this might be called before the telepathy stuff is prepared.

Do not use the TelepathyHelper::accounts(), and use the ::accountIds() instead as this might be called before the telepathy stuff is prepared.

== 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/telephony-service) on device or emulator?
Yes

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:802
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/170/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/170/rebuild

review: Approve (continuous-integration)

[lp:~boiko/telephony-service/fix_call_earlier]

803. By Gustavo Pichorim Boiko on 2014-04-15

Merge latest changes from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:803
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/171/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

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.
Yes

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

review: Approve

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2014-04-08 20:28:49 +0000
+++ libtelephonyservice/callmanager.cpp	2014-04-15 17:21:39 +0000
@@ -115,15 +115,13 @@
 
 void CallManager::startCall(const QString &phoneNumber, const QString &accountId)
 {
-    Tp::AccountPtr account;
-    if (accountId.isNull()) {
-        account = TelepathyHelper::instance()->accounts()[0];
-    } else {
-        account = TelepathyHelper::instance()->accountForId(accountId);
+    QString account = accountId;
+    if (account.isNull()) {
+        account = TelepathyHelper::instance()->accountIds()[0];
     }
 
     QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
-    phoneAppHandler->call("StartCall", phoneNumber, account->uniqueIdentifier());
+    phoneAppHandler->call("StartCall", phoneNumber, account);
 }
 
 void CallManager::onConnectedChanged()