Changeset 8701 for branches/gajim_0.11.1/src/common

Timestamp:

09/03/07 11:22:12 (15 months ago)

Author:

asterix

Message:

handle gnome-heyring DeniedError?. Fix #3300

Files:

• branches/gajim_0.11.1/src/common/passwords.py (modified) (2 diffs)

branches/gajim_0.11.1/src/common/passwords.py

@@ -82 +82 @@
                 display_name = _('Gajim account %s') % account_name
                 attributes = dict(account_name=str(account_name), gajim=1)
-                auth_token = gnomekeyring.item_create_sync(
-                        self.keyring, gnomekeyring.ITEM_GENERIC_SECRET,
-                        display_name, attributes, password, update)
+                try:
+                        auth_token = gnomekeyring.item_create_sync(
+                                self.keyring, gnomekeyring.ITEM_GENERIC_SECRET,
+                                display_name, attributes, password, update)
+                except gnomekeyring.DeniedError:
+                        set_storage(SimplePasswordStorage())
+                        storage.save_password(account_name, password)
+                        return
                 token = 'gnomekeyring:%i' % auth_token
                 gajim.config.set_per('accounts', account_name, 'password', token)
@@ -112 +117 @@
                         except gnomekeyring.NoKeyringDaemonError:
                                 storage = SimplePasswordStorage()
+                        except gnomekeyring.DeniedError:
+                                storage = SimplePasswordStorage()
                 else:
                         storage = SimplePasswordStorage()