Merge lp:~apachelogger/ubuntuone-client/kwallet-support into lp:ubuntuone-client
Status: | Rejected |
---|---|
Rejected by: | Guillermo Gonzalez |
Proposed branch: | lp:~apachelogger/ubuntuone-client/kwallet-support |
Merge into: | lp:ubuntuone-client |
Diff against target: |
71 lines (+46/-1) 1 file modified
ubuntuone/syncdaemon/main.py (+46/-1) |
To merge this branch: | bzr merge lp:~apachelogger/ubuntuone-client/kwallet-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Disapprove | ||
Rodrigo Moya (community) | Disapprove | ||
Tim Cole (community) | Approve | ||
Review via email: mp+31138@code.launchpad.net |
Description of the change
Enable syncdaemon to get tokens from kwallet if present and accessible (falls back to gnome-keyring if that is also present).
Covered cases:
KDE with ubuntuone-kde: kwallet -> success -> hooray
KDE without ubuntuone-kde: kwallet -> fail -> try gnomekeyring -> success -> hooray
GNOME: gnomekeyring -> success -> hooray
(ubuntuone-kde is not supported at this time so this case ought not to be covered, OTOH it might be neat to support it nether the less ... if you wish to do so, we can arange that with cilling the external process call and just try to import kwallet regardless of the environment.
Unmerged revisions
- 602. By Harald Sitter
-
actually ubuntuone-kde uses "ubuntuone" as folder since the realm can be either one.ubuntu.com or ubuntuone.com
- 601. By Harald Sitter
-
Add as non-intrusive kwallet support as possible to the syncdaemon
We are removing the use of the gnome keyring since we are moving to use ubuntu-sso, which returns the credentials via DBus, so you'd better add kwallet support there, not here