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

migrate from kwalletbindings to libsecret too

This commit is contained in:
Yann Leboulanger 2015-07-18 15:52:08 +02:00
parent 23474c2b2f
commit 3e843b8e55
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/passwords.py
View File

@ -168,8 +168,15 @@ class SecretPasswordStorage(PasswordStorage):
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')
if conf is None or conf == '<kwallet>': if conf is None:
return None return None
if conf == '<kwallet>':
# Migrate from kwallet
if kwalletbinding.kwallet_available():
kw_storage = KWalletPasswordStorage()
password = kw_storage.get_password(account_name)
self.save_password(account_name, password)
return password
if conf.startswith('gnomekeyring:'): if conf.startswith('gnomekeyring:'):
# migrate from libgnomekeyring # migrate from libgnomekeyring
GnomePasswordStorage GnomePasswordStorage
@ -188,7 +195,7 @@ class SecretPasswordStorage(PasswordStorage):
except GnomeKeyringError: except GnomeKeyringError:
return None return None
password = gk_storage.get_password(account_name) password = gk_storage.get_password(account_name)
save_password(account_name, password) self.save_password(account_name, password)
return password return password
if not conf.startswith('libsecret:'): if not conf.startswith('libsecret:'):
password = conf password = conf