Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1420847 into lp:~online-accounts/ubuntu-system-settings-online-accounts/master
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Merged at revision: | 231 |
Proposed branch: | lp:~mardy/ubuntu-system-settings-online-accounts/lp1420847 |
Merge into: | lp:~online-accounts/ubuntu-system-settings-online-accounts/master |
Diff against target: |
165 lines (+59/-17) 5 files modified
online-accounts-service/mir-helper-stub.cpp (+9/-0) online-accounts-service/mir-helper.h (+2/-0) online-accounts-service/ui-proxy.cpp (+8/-17) tests/online-accounts-service/tst_ui_proxy.cpp (+39/-0) tests/online-accounts-service/tst_ui_proxy.pro (+1/-0) |
To merge this branch: | bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1420847 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Abreu (community) | Approve | ||
Review via email: mp+249842@code.launchpad.net |
Commit message
Fail initialization if trust session cannot be setup.
Description of the change
Fail initialization if trust session cannot be setup.
To post a comment you must log in.