Skip to content

Commit

Permalink
Fix bug #545: Keyring doesn't work with KDE Plasma5
Browse files Browse the repository at this point in the history
  • Loading branch information
Germar committed Mar 1, 2016
1 parent 0daf96f commit 6441010
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Back In Time

Version 1.1.13
* Fix bug: Keyring doesn't work with KDE Plasma5 (https://github.com/bit-team/backintime/issues/545)
* Fix bug: Qt4 built-in phrases where not translated (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816197)
* Fix bug: configure ingnore unknown args (https://github.com/bit-team/backintime/issues/547)
* Fix bug: snapshots-list on command-line was not sorted
Expand Down
6 changes: 4 additions & 2 deletions common/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,8 @@ def keyring_supported():
except: pass
try: backends.append(keyring.backends.kwallet.Keyring)
except: pass
try: backends.append(keyring.backends.kwallet.DBusKeyring)
except: pass
try: backends.append(keyring.backend.SecretServiceKeyring)
except: pass
try: backends.append(keyring.backend.GnomeKeyring)
Expand All @@ -794,9 +796,9 @@ def keyring_supported():
displayName = keyring.get_keyring().__module__
except:
displayName = str(keyring.get_keyring())
if backends:
if backends and isinstance(keyring.get_keyring(), tuple(backends)):
logger.debug("Found appropriate keyring '{}'".format(displayName))
return isinstance(keyring.get_keyring(), tuple(backends))
return True
logger.debug("No appropriate keyring found. '{}' can't be used with BackInTime".format(displayName))
return False

Expand Down

0 comments on commit 6441010

Please sign in to comment.