Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.2 into lp:ubuntu/maverick/ubuntu-sso-client

[Natalia Bidart]

Simple bug fixes, releasing v1.0.2.

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-09-14 19:28:09 +0000
+++ PKG-INFO	2010-09-22 17:36:13 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 1.0.1
+Version: 1.0.2
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-14 19:28:09 +0000
+++ debian/changelog	2010-09-22 17:36:13 +0000
@@ -1,3 +1,19 @@
+ubuntu-sso-client (1.0.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Avoiding having the main window freezing when pinging the U1 server (LP:
+    #645162).
+
+  [ Alejandro J. Cura <[e-mail]> ]
+    * Do not create the login keyring, use default instead. (LP: #639690)
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Avoid duplicating logging messages for module "main" (LP: #638981).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Wed, 22 Sep 2010 13:47:22 -0300
+
 ubuntu-sso-client (1.0.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release:

=== modified file 'debian/preinst'
--- debian/preinst	2010-09-09 14:45:42 +0000
+++ debian/preinst	2010-09-22 17:36:13 +0000
@@ -3,7 +3,7 @@
 
 LASTVERSION="0.99.4-0ubuntu1"
 
-pkill -HUP ubuntu-sso-login || true
+pkill -HUP -f ubuntu-sso-login || true
 
 dpkg-maintscript-helper rm_conffile \
 /etc/xdg/ubuntu-sso/oauth_registration.d/ubuntuone "$LASTVERSION" -- "$@"

=== modified file 'setup.py'
--- setup.py	2010-09-14 19:28:09 +0000
+++ setup.py	2010-09-22 17:36:13 +0000
@@ -86,7 +86,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='1.0.1',
+    version='1.0.2',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-09-08 19:25:02 +0000
+++ ubuntu_sso/gui.py	2010-09-22 17:36:13 +0000
@@ -730,10 +730,14 @@
                         signal, method, iface)
             remove(method, signal_name=signal, dbus_interface=iface)
 
-        # destroy main window
+        # hide the main window
         if self.window is not None:
             self.window.hide()
 
+        # process any pending events before emitting signals
+        while gtk.events_pending():
+            gtk.main_iteration()
+
         if len(args) > 0 and args[0] in self.cancels:
             self.window.emit(SIG_USER_CANCELATION, self.app_name)
         elif len(self._gtk_signal_log) > 0:

=== modified file 'ubuntu_sso/keyring.py'
--- ubuntu_sso/keyring.py	2010-09-13 14:43:37 +0000
+++ ubuntu_sso/keyring.py	2010-09-22 17:36:13 +0000
@@ -28,7 +28,7 @@
 from ubuntu_sso.logger import setup_logging
 
 
-logger = setup_logging("ubuntu_sso.main")
+logger = setup_logging("ubuntu_sso.keyring")
 TOKEN_SEPARATOR = ' @ '
 SEPARATOR_REPLACEMENT = ' AT '
 
@@ -59,8 +59,6 @@
 class Keyring(object):
     """A Keyring for a given application name."""
 
-    KEYRING_NAME = "login"
-
     def __init__(self, app_name):
         """Initialize this instance given the app_name."""
         if not gnomekeyring.is_available():
@@ -68,12 +66,6 @@
         self.app_name = app_name
         self.token_name = get_token_name(self.app_name)
 
-    def _create_keyring(self, name):
-        """Creates a keyring, or if it already exists, it does nothing."""
-        keyring_names = gnomekeyring.list_keyring_names_sync()
-        if not name in keyring_names:
-            gnomekeyring.create_sync(name, None)
-
     def _find_keyring_item(self, attr=None):
         """Return the keyring item or None if not found."""
         if attr is None:
@@ -105,13 +97,9 @@
         # Creates the secret from the credentials
         secret = urllib.urlencode(cred)
 
-        # Create the keyring if it does not exists
-        self._create_keyring(self.KEYRING_NAME)
-
         # Add our SSO credentials to the keyring
-        gnomekeyring.item_create_sync(self.KEYRING_NAME,
-                gnomekeyring.ITEM_GENERIC_SECRET, self.app_name,
-                self._get_keyring_attr(), secret, True)
+        gnomekeyring.item_create_sync(None, gnomekeyring.ITEM_GENERIC_SECRET,
+                        self.app_name, self._get_keyring_attr(), secret, True)
 
     def _migrate_old_token_name(self):
         """Migrate credentials with old name, store them with new name."""

=== modified file 'ubuntu_sso/tests/test_keyring.py'
--- ubuntu_sso/tests/test_keyring.py	2010-09-13 14:43:37 +0000
+++ ubuntu_sso/tests/test_keyring.py	2010-09-22 17:36:13 +0000
@@ -60,7 +60,6 @@
 
     def __init__(self):
         """Initialize this instance."""
-        self.keyrings = set()
         self.id_counter = itertools.count()
         self.store = {}
         self.deleted = []
@@ -89,14 +88,6 @@
             raise gnomekeyring.NoMatchError()
         return items
 
-    def list_keyring_names_sync(self):
-        """The keyring you are looking for may be here."""
-        return self.keyrings
-
-    def create_sync(self, name, password):
-        """Thanks, I'll create that keyring for you."""
-        self.keyrings.add((name, password))
-
     def is_available(self):
         """A very available keyring."""
         return True
@@ -146,9 +137,6 @@
         self.mgk = MockGnomeKeyring()
         self.patch(gnomekeyring, "item_create_sync", self.mgk.item_create_sync)
         self.patch(gnomekeyring, "is_available", self.mgk.is_available)
-        self.patch(gnomekeyring, "create_sync", self.mgk.create_sync)
-        self.patch(gnomekeyring, "list_keyring_names_sync",
-                                              self.mgk.list_keyring_names_sync)
         self.patch(gnomekeyring, "find_items_sync", self.mgk.find_items_sync)
         self.patch(gnomekeyring, "item_delete_sync", self.mgk.item_delete_sync)
         fake_gethostname = build_fake_gethostname("darkstar")
@@ -163,8 +151,6 @@
 
         self.assertEqual(len(self.mgk.store), 2)
         self.assertEqual(len(self.mgk.deleted), 0)
-        self.assertEqual(self.mgk.keyrings,
-                         set([(keyring.Keyring.KEYRING_NAME, None)]))
 
     def test_delete_ubuntusso(self):
         """Test that a given key is deleted."""
@@ -202,8 +188,8 @@
             "oauth_token_secret": sample_oauth_secret,
         }
         secret = urllib.urlencode(old_creds)
-        self.mgk.item_create_sync(keyring.U1_APP_NAME, None,
-                                  keyring.Keyring.KEYRING_NAME,
+        self.mgk.item_create_sync(None, None,
+                                  keyring.U1_APP_NAME,
                                   keyring.U1_KEY_ATTR,
                                   secret, True)
 
@@ -223,8 +209,8 @@
             "oauth_token_secret": sample_oauth_secret,
         }
         secret = urllib.urlencode(old_creds)
-        self.mgk.item_create_sync(keyring.U1_APP_NAME, None,
-                                  keyring.Keyring.KEYRING_NAME,
+        self.mgk.item_create_sync(None, None,
+                                  keyring.U1_APP_NAME,
                                   keyring.U1_KEY_ATTR,
                                   secret, True)