brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notificationdaemon: fix gtk protocol for newer glib

Browse Source 
The new protocol uses a "priority" string instead of the "urgent"
boolean.
This commit is contained in:
Giovanni Campagna 2014-07-01 21:47:31 +02:00 committed by Florian Müllner
parent ffa8ff730e
commit 68f5674e62
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/notificationDaemon.js
View File

@ -691,6 +691,12 @@ const FdoNotificationDaemonSource = new Lang.Class({
} }
}); });
const PRIORITY_URGENCY_MAP = {
low: MessageTray.Urgency.LOW,
normal: MessageTray.Urgency.NORMAL,
high: MessageTray.Urgency.HIGH,
urgent: MessageTray.Urgency.CRITICAL
};
const GtkNotificationDaemonNotification = new Lang.Class({ const GtkNotificationDaemonNotification = new Lang.Class({
Name: 'GtkNotificationDaemonNotification', Name: 'GtkNotificationDaemonNotification',
@ -704,12 +710,20 @@ const GtkNotificationDaemonNotification = new Lang.Class({
"body": body, "body": body,
"icon": gicon, "icon": gicon,
"urgent": urgent, "urgent": urgent,
"priority": priority,
"buttons": buttons, "buttons": buttons,
"default-action": defaultAction, "default-action": defaultAction,
"default-action-target": defaultActionTarget } = notification; "default-action-target": defaultActionTarget } = notification;
this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL if (priority) {
: MessageTray.Urgency.NORMAL); let urgency = PRIORITY_URGENCY_MAP[priority.unpack()];
this.setUrgency(urgency != undefined ? urgency : MessageTray.Urgency.NORMAL);
} else if (urgent) {
this.setUrgency(urgent.unpack() ? MessageTray.Urgency.CRITICAL
: MessageTray.Urgency.NORMAL);
} else {
this.setUrgency(MessageTray.Urgency.NORMAL);
}
if (buttons) { if (buttons) {
buttons.deep_unpack().forEach(Lang.bind(this, function(button) { buttons.deep_unpack().forEach(Lang.bind(this, function(button) {