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

[Chad Miller]

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

[Stuart Langridge (sil)]

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

review: Approve

=== modified file 'bin/desktopcouch-pair'
--- bin/desktopcouch-pair	2009-09-28 18:58:18 +0000
+++ bin/desktopcouch-pair	2009-10-14 14:55:19 +0000
@@ -882,6 +882,9 @@
 
 def main(args):
     """Start execution."""
+    import gobject
+    gobject.set_application_name("desktopcouch pairing tool")
+
     global pick_or_listen  # pylint: disable-msg=W0601
 
     logging.basicConfig(level=logging.DEBUG, format=

=== modified file 'bin/desktopcouch-service'
--- bin/desktopcouch-service	2009-09-28 15:56:44 +0000
+++ bin/desktopcouch-service	2009-10-14 14:55:19 +0000
@@ -70,6 +70,8 @@
 
 if __name__ == "__main__":
     import xdg.BaseDirectory
+    import gobject
+    gobject.set_application_name("desktopcouch service")
 
     log_directory = os.path.join(xdg.BaseDirectory.xdg_cache_home,
             "desktop-couch/log")

=== modified file 'desktopcouch/replication_services/ubuntuone.py'
--- desktopcouch/replication_services/ubuntuone.py	2009-09-28 15:13:33 +0000
+++ desktopcouch/replication_services/ubuntuone.py	2009-10-14 14:55:19 +0000
@@ -52,8 +52,6 @@
 
 def get_oauth_token(consumer):
     """Get the token from the keyring"""
-    import gobject
-    gobject.set_application_name("desktopcouch replication to Ubuntu One")
     try:
         items = gnomekeyring.find_items_sync(
             gnomekeyring.ITEM_GENERIC_SECRET,