Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: fix name conflict in tray_notify_* functions

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-06-07 01:13:54 +02:00
parent 1ed9c74d83
commit a1d6ce433a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/notify.py
View File

@ -34,16 +34,18 @@ def tray_notify_init():
except dbus.DBusException as ex: except dbus.DBusException as ex:
print >>sys.stderr, "WARNING: failed connect to tray notification service: %s" % str(ex) print >>sys.stderr, "WARNING: failed connect to tray notification service: %s" % str(ex)
def tray_notify(str, label, timeout = 3000): def tray_notify(msg, label, timeout = 3000):
if notify_object: if notify_object:
if label: if label:
if not isinstance(label, str): if not isinstance(label, str):
label = label.icon label = label.icon
notify_object.Notify("Qubes", 0, label, "Qubes", str, [], [], timeout, dbus_interface="org.freedesktop.Notifications") notify_object.Notify("Qubes", 0, label, "Qubes", msg, [], [], timeout,
dbus_interface="org.freedesktop.Notifications")
def tray_notify_error(str, timeout = 3000): def tray_notify_error(msg, timeout = 3000):
if notify_object: if notify_object:
notify_object.Notify("Qubes", 0, "dialog-error", "Qubes", str, [], [], timeout, dbus_interface="org.freedesktop.Notifications") notify_object.Notify("Qubes", 0, "dialog-error", "Qubes", msg, [], [],
timeout, dbus_interface="org.freedesktop.Notifications")
def notify_error_qubes_manager(name, message): def notify_error_qubes_manager(name, message):
global system_bus global system_bus