copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[gjc] workaround gnome-keyring-daemon bug. see #2595

Browse source
This commit is contained in:
Yann Leboulanger 2006-11-01 16:49:49 +00:00
parent dba0a34a74
commit 6466c45d74
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/passwords.py
View file

@ -33,7 +33,7 @@ class PasswordStorage(object):
raise NotImplementedError raise NotImplementedError
def save_password(self, account_name, password): def save_password(self, account_name, password):
raise NotImplementedError raise NotImplementedError
class SimplePasswordStorage(PasswordStorage): class SimplePasswordStorage(PasswordStorage):
def get_password(self, account_name): def get_password(self, account_name):
@ -45,8 +45,16 @@ class SimplePasswordStorage(PasswordStorage):
class GnomePasswordStorage(PasswordStorage): class GnomePasswordStorage(PasswordStorage):
def __init__(self): def __init__(self):
self.keyring = gnomekeyring.get_default_keyring_sync() # self.keyring = gnomekeyring.get_default_keyring_sync()
## above line commented and code below inserted as workaround
## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019
self.keyring = "default"
try:
gnomekeyring.create_sync(self.keyring, None)
except gnomekeyring.AlreadyExistsError:
pass
def get_password(self, account_name): def get_password(self, account_name):
conf = gajim.config.get_per('accounts', account_name, 'password') conf = gajim.config.get_per('accounts', account_name, 'password')
@ -73,7 +81,7 @@ class GnomePasswordStorage(PasswordStorage):
## no keyring daemon: in the future, stop using it ## no keyring daemon: in the future, stop using it
set_storage(SimplePasswordStorage()) set_storage(SimplePasswordStorage())
return None return None
def save_password(self, account_name, password, update=True): def save_password(self, account_name, password, update=True):
display_name = _('Gajim account %s') % account_name display_name = _('Gajim account %s') % account_name
attributes = dict(account_name=str(account_name), gajim=1) attributes = dict(account_name=str(account_name), gajim=1)