changeset 89fb94925f32 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=89fb94925f32 description: if config file says password is saved with libsecret (with py3 branch) we can still get it with gnomekeyring

diffstat:

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

diffs (23 lines):

diff -r f583d7b71314 -r 89fb94925f32 src/common/passwords.py --- a/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:53:58 2015 +0200 @@ -49,8 +49,8 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and (passwd.startswith('gnomekeyring:') or \ - passwd == '<kwallet>'): + if passwd and (passwd.startswith('gnomekeyring:') or passwd.startswith('libsecret:') or \ + passwd == '<kwallet>'): # this is not a real password, it's either a gnome # keyring token or stored in the KDE wallet return None @@ -79,7 +79,7 @@ conf = gajim.config.get_per('accounts', account_name, 'password') if conf is None or conf == '<kwallet>': return None - if not conf.startswith('gnomekeyring:'): + if not (conf.startswith('gnomekeyring:') or conf.startswith('libsecret')): password = conf ## migrate the password over to keyring try: