Merge lp:~cmiller/desktopcouch/keyring-access-description into lp:desktopcouch

Proposed by Chad Miller on 2009-10-14
Status: Merged
Approved by: Chad Miller on 2009-10-14
Approved revision: 89
Merged at revision: not available
Proposed branch: lp:~cmiller/desktopcouch/keyring-access-description
Merge into: lp:desktopcouch
Diff against target: 39 lines
3 files modified
bin/desktopcouch-pair (+3/-0)
bin/desktopcouch-service (+2/-0)
desktopcouch/replication_services/ubuntuone.py (+0/-2)
To merge this branch: bzr merge lp:~cmiller/desktopcouch/keyring-access-description
Reviewer Review Type Date Requested Status
Stuart Langridge (community) 2009-10-14 Approve on 2009-10-14
Review via email: mp+13348@code.launchpad.net

Commit message

Set gobject application name at program start, so keychain access has a useful name. (LP: #451333)

To post a comment you must log in.
Stuart Langridge (sil) wrote :

Good call. markgsaye mentioned this a few days ago and I meant to file a bug about it :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/desktopcouch-pair'
2--- bin/desktopcouch-pair 2009-09-28 18:58:18 +0000
3+++ bin/desktopcouch-pair 2009-10-14 14:55:19 +0000
4@@ -882,6 +882,9 @@
5
6 def main(args):
7 """Start execution."""
8+ import gobject
9+ gobject.set_application_name("desktopcouch pairing tool")
10+
11 global pick_or_listen # pylint: disable-msg=W0601
12
13 logging.basicConfig(level=logging.DEBUG, format=
14
15=== modified file 'bin/desktopcouch-service'
16--- bin/desktopcouch-service 2009-09-28 15:56:44 +0000
17+++ bin/desktopcouch-service 2009-10-14 14:55:19 +0000
18@@ -70,6 +70,8 @@
19
20 if __name__ == "__main__":
21 import xdg.BaseDirectory
22+ import gobject
23+ gobject.set_application_name("desktopcouch service")
24
25 log_directory = os.path.join(xdg.BaseDirectory.xdg_cache_home,
26 "desktop-couch/log")
27
28=== modified file 'desktopcouch/replication_services/ubuntuone.py'
29--- desktopcouch/replication_services/ubuntuone.py 2009-09-28 15:13:33 +0000
30+++ desktopcouch/replication_services/ubuntuone.py 2009-10-14 14:55:19 +0000
31@@ -52,8 +52,6 @@
32
33 def get_oauth_token(consumer):
34 """Get the token from the keyring"""
35- import gobject
36- gobject.set_application_name("desktopcouch replication to Ubuntu One")
37 try:
38 items = gnomekeyring.find_items_sync(
39 gnomekeyring.ITEM_GENERIC_SECRET,

Subscribers

People subscribed via source and target branches