changeset a04b50b4ae09 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=a04b50b4ae09 description: handle the case when user press cancell at gnome keyring password dialog when saving a password. Fixes #7305

diffstat:

src/common/passwords.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r 35a555c4a107 -r a04b50b4ae09 src/common/passwords.py --- a/src/common/passwords.py Sun Feb 17 12:39:50 2013 +0100 +++ b/src/common/passwords.py Tue Feb 19 13:22:49 2013 +0100 @@ -126,14 +126,14 @@ 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