From 81714ce1a34ffe92b27e2d2ebb0b9298601e9669 Mon Sep 17 00:00:00 2001 From: Hellyna Ng Date: Wed, 12 Jan 2011 05:33:03 +0800 Subject: [PATCH] Notifications with CRITICAL urgency are no longer timed out Notifications with CRITICAL urgency should not pop down until the user interacts with them. https://bugzilla.gnome.org/show_bug.cgi?id=630942 --- js/ui/messageTray.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index 04a968b56..da8f7e891 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -1379,7 +1379,7 @@ MessageTray.prototype = { let notificationsPending = this._notificationQueue.length > 0; let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved; let notificationExpanded = this._notificationBin.y < 0; - let notificationExpired = (this._notificationTimeoutId == 0 && !this._pointerInTray && !this._locked) || this._notificationRemoved; + let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked) || this._notificationRemoved; if (this._notificationState == State.HIDDEN) { if (notificationsPending) @@ -1527,7 +1527,8 @@ MessageTray.prototype = { }, _showNotificationCompleted: function() { - this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000); + if (this._notification.urgency != Urgency.CRITICAL) + this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000); }, _updateNotificationTimeout: function(timeout) {