Prefer KF5 in kwallet to KF4. Fixes #168.

jaraco · Mar 12, 2016 · 7fc3b2f · 7fc3b2f
1 parent ea78799
commit 7fc3b2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+8.5
+---
+
+* Issue #168: Now prefer KF5 Kwallet to KF4. Users relying
+  on KF4 must use prior releases.
+
 ---
 8.4
 ---

diff --git a/keyring/backends/kwallet.py b/keyring/backends/kwallet.py
@@ -27,9 +27,9 @@ def priority(cls):
         except dbus.DBusException as exc:
             raise RuntimeError(exc.get_dbus_message())
         try:
-            bus.get_object('org.kde.kwalletd', '/modules/kwalletd')
+            bus.get_object('org.kde.kwalletd5', '/modules/kwalletd5')
         except dbus.DBusException:
-            raise RuntimeError('cannot connect to org.kde.kwalletd')
+            raise RuntimeError('cannot connect to org.kde.kwalletd5')
         return 5.1
 
     def __init__(self, *arg, **kw):
@@ -42,7 +42,7 @@ def connected(self):
         bus = dbus.SessionBus()
         wId = 0
         try:
-            remote_obj = bus.get_object('org.kde.kwalletd', '/modules/kwalletd')
+            remote_obj = bus.get_object('org.kde.kwalletd5', '/modules/kwalletd5')
             self.iface = dbus.Interface(remote_obj, 'org.kde.KWallet')
             self.handle = self.iface.open(
                         self.iface.networkWallet(), wId, self.appid)