Merge lp://staging/~online-accounts/signon/packaging into lp://staging/signon

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 626
Proposed branch: lp://staging/~online-accounts/signon/packaging
Merge into: lp://staging/signon
Diff against target: 86 lines (+15/-6)
5 files modified
debian/changelog (+9/-0)
lib/SignOn/authsession.h (+2/-1)
lib/SignOn/authsessionimpl.cpp (+2/-0)
lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp (+1/-0)
src/signond/signondaemon.cpp (+1/-5)
To merge this branch: bzr merge lp://staging/~online-accounts/signon/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+257252@code.staging.launchpad.net

Commit message

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

Description of the change

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

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
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
626. By Alberto Mardegan

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)
 Fixes: #1415492
Approved by: PS Jenkins bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

No one subscribed via source and target branches