Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1421009 into lp:ubuntu-system-settings-online-accounts

  1. lp1421009
  2. Merge into trunk
Proposed by Alberto Mardegan on 2015-04-23
Status: Merged
Merged at revision: 276
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1421009
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 34 lines (+6/-6)
1 file modified
online-accounts-service/main.cpp (+6/-6)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1421009
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-04-23
Online Accounts 2015-04-23 Pending
Review via email: mp+257267@code.launchpad.net

Commit Message

Make sure that the DBus objects are ready, before registering the service name

Description of the Change

Make sure that the DBus objects are ready, before registering the service name

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-service/main.cpp'
2--- online-accounts-service/main.cpp 2015-01-09 16:40:14 +0000
3+++ online-accounts-service/main.cpp 2015-04-23 14:56:10 +0000
4@@ -66,24 +66,24 @@
5
6 Service *service = new Service();
7 QDBusConnection connection = QDBusConnection::sessionBus();
8+ connection.registerObject(OAU_OBJECT_PATH, service);
9 connection.registerService(OAU_SERVICE_NAME);
10- connection.registerObject(OAU_OBJECT_PATH, service);
11
12 SignOnUi::Service *signonuiService = new SignOnUi::Service();
13+ connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
14+ QDBusConnection::ExportAllContents);
15 connection.registerService(SIGNONUI_SERVICE_NAME);
16- connection.registerObject(SIGNONUI_OBJECT_PATH, signonuiService,
17- QDBusConnection::ExportAllContents);
18
19 SignOnUi::IndicatorService *indicatorService =
20 new SignOnUi::IndicatorService();
21- connection.registerService(WEBCREDENTIALS_BUS_NAME);
22 connection.registerObject(WEBCREDENTIALS_OBJECT_PATH,
23 indicatorService->serviceObject());
24+ connection.registerService(WEBCREDENTIALS_BUS_NAME);
25
26 LibaccountsService *libaccountsService = new LibaccountsService();
27+ connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
28+ QDBusConnection::ExportAllContents);
29 connection.registerService(LIBACCOUNTS_BUS_NAME);
30- connection.registerObject(LIBACCOUNTS_OBJECT_PATH, libaccountsService,
31- QDBusConnection::ExportAllContents);
32
33 InactivityTimer *inactivityTimer = 0;
34 if (daemonTimeout > 0) {

Subscribers

People subscribed via source and target branches