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
This commit is contained in:
Hellyna Ng 2011-01-12 05:33:03 +08:00 committed by Marina Zhurakhinskaya
parent 6bae9ed20d
commit 81714ce1a3

View File

@ -1379,7 +1379,7 @@ MessageTray.prototype = {
let notificationsPending = this._notificationQueue.length > 0; let notificationsPending = this._notificationQueue.length > 0;
let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved; let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
let notificationExpanded = this._notificationBin.y < 0; 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 (this._notificationState == State.HIDDEN) {
if (notificationsPending) if (notificationsPending)
@ -1527,7 +1527,8 @@ MessageTray.prototype = {
}, },
_showNotificationCompleted: function() { _showNotificationCompleted: function() {
this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000); if (this._notification.urgency != Urgency.CRITICAL)
this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
}, },
_updateNotificationTimeout: function(timeout) { _updateNotificationTimeout: function(timeout) {