From 2c389640a70b47835591a013a7e5c63b4618ceff Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 19 Feb 2013 13:22:49 +0100 Subject: [PATCH] handle the case when user press cancell at gnome keyring password dialog when saving a password. Fixes #7305 --- src/common/passwords.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/passwords.py b/src/common/passwords.py index f65222c85..5c5114bb7 100644 --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -126,14 +126,14 @@ class GnomePasswordStorage(PasswordStorage): password = str() try: auth_token = gnomekeyring.item_create_sync( - self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, - display_name, attributes1, password, update) - except gnomekeyring.DeniedError: + self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, display_name, + attributes1, password, update) + except (gnomekeyring.DeniedError, gnomekeyring.CancelledError): set_storage(SimplePasswordStorage()) storage.save_password(account_name, password) return gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') + 'gnomekeyring:') if account_name in gajim.connections: gajim.connections[account_name].password = password