Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Drop org.kde.VisualNotifications notifier as it has long since been supplanted by the equivalent FreeDesktop facility and doesn't even exist in KDE 5 anymore

Browse Source
This commit is contained in:
Alexander Schlarb 2020-10-28 17:11:51 +01:00
parent 35df1312a2
commit 92870512d9
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/notify.py
View File

@ -49,24 +49,6 @@ class DBUSNotifier(Notifier):
prints(server, 'found' if self.ok else 'not found', 'in', '%.1f' % (time.time() - start), 'seconds') prints(server, 'found' if self.ok else 'not found', 'in', '%.1f' % (time.time() - start), 'seconds')
class KDENotifier(DBUSNotifier):
SERVICE = 'org.kde.VisualNotifications', '/VisualNotifications', 'org.kde.VisualNotifications'
def __call__(self, body, summary=None, replaces_id=None, timeout=0):
if replaces_id is None:
replaces_id = self.dbus.UInt32()
event_id = ''
timeout, body, summary = self.get_msg_parms(timeout, body, summary)
try:
self._notify.Notify('calibre', replaces_id, event_id, self.ICON, summary, body,
self.dbus.Array(signature='s'), self.dbus.Dictionary(signature='sv'),
timeout)
except:
import traceback
traceback.print_exc()
class FDONotifier(DBUSNotifier): class FDONotifier(DBUSNotifier):
SERVICE = 'org.freedesktop.Notifications', '/org/freedesktop/Notifications', 'org.freedesktop.Notifications' SERVICE = 'org.freedesktop.Notifications', '/org/freedesktop/Notifications', 'org.freedesktop.Notifications'
@ -88,7 +70,7 @@ def get_dbus_notifier():
import dbus import dbus
session_bus = dbus.SessionBus() session_bus = dbus.SessionBus()
names = frozenset(session_bus.list_names()) names = frozenset(session_bus.list_names())
for srv in KDENotifier, FDONotifier: for srv in (FDONotifier,):
if srv.SERVICE[0] in names: if srv.SERVICE[0] in names:
ans = srv(session_bus) ans = srv(session_bus)
if ans.ok: if ans.ok: