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

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 848
Merged at revision: 848
Proposed branch: lp:~boiko/telephony-service/fix_freeze
Merge into: lp:telephony-service
Diff against target: 44 lines (+4/-1)
3 files modified
handler/main.cpp (+1/-1)
libtelephonyservice/telepathyhelper.cpp (+2/-0)
libtelephonyservice/telepathyhelper.h (+1/-0)
To merge this branch: bzr merge lp:~boiko/telephony-service/fix_freeze
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+226828@code.launchpad.net

Commit message

Make sure the handler gets registered to DBus even when there is no compatible telepathy account configured.

Description of the change

Make sure the handler gets registered to DBus even when there is no compatible telepathy account configured.

== 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 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
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'handler/main.cpp'
2--- handler/main.cpp 2014-04-07 19:13:03 +0000
3+++ handler/main.cpp 2014-07-15 13:43:53 +0000
4@@ -54,7 +54,7 @@
5
6 HandlerDBus dbus;
7
8- QObject::connect(TelepathyHelper::instance(), SIGNAL(accountReady()),
9+ QObject::connect(TelepathyHelper::instance(), SIGNAL(setupReady()),
10 &dbus, SLOT(connectToBus()));
11
12 return app.exec();
13
14=== modified file 'libtelephonyservice/telepathyhelper.cpp'
15--- libtelephonyservice/telepathyhelper.cpp 2014-06-27 20:37:38 +0000
16+++ libtelephonyservice/telepathyhelper.cpp 2014-07-15 13:43:53 +0000
17@@ -66,6 +66,7 @@
18 SLOT(onAccountManagerReady(Tp::PendingOperation*)));
19
20 mClientRegistrar = Tp::ClientRegistrar::create(mAccountManager);
21+ connect(this, SIGNAL(accountReady()), SIGNAL(setupReady()));
22 }
23
24 TelepathyHelper::~TelepathyHelper()
25@@ -328,6 +329,7 @@
26
27 if (mAccounts.count() == 0) {
28 qCritical() << "No compatible telepathy account found!";
29+ Q_EMIT setupReady();
30 return;
31 }
32
33
34=== modified file 'libtelephonyservice/telepathyhelper.h'
35--- libtelephonyservice/telepathyhelper.h 2014-06-27 20:37:38 +0000
36+++ libtelephonyservice/telepathyhelper.h 2014-07-15 13:43:53 +0000
37@@ -69,6 +69,7 @@
38 void accountReady();
39 void connectedChanged();
40 void accountIdsChanged();
41+ void setupReady();
42
43 public Q_SLOTS:
44 Q_INVOKABLE void registerChannelObserver(const QString &observerName = QString::null);

Subscribers

People subscribed via source and target branches