Merge lp:~tkluck/ubuntu/precise/gnome-shell/lp883443 into lp:ubuntu/precise/gnome-shell

[Timo Kluck]

This fixes #883443. Testcase:

send a critical, transient message:

$ notify-send -u critical -h int:transient:1 "blabla"

it will never disappear in gnome-shell. In ubuntu-patched network-manager, a network disconnect leads to such a message. It will even reappear after suspend/hibernate etc (even if the networking situation has changed any number of times in between), which is very confusing. The patch makes sure that critical, transient messages behave as if they are urgency=normal messages. They will show for 4 seconds and then disappear.

I am not aware of any other critical, transient messages, and it seems contrary to the spirit of messaging in gnome-shell. So this should probably be patched on the ubuntu side.

[lp:~tkluck/ubuntu/precise/gnome-shell/lp883443]

49. By Timo Kluck on 2012-03-20

 - Treat transient, critical notifications the same as non-critical
   ones (notably the ubuntu-specific one that says "network disconnected,
   you are now offline") Closes: #883443
*

[Luke Yelavich (themuso)]

Jeremy, since you work on gnome-shell a fair bit, could you please have a look at this?

[Mathieu Trudel-Lapierre (cyphermox)]

I'll NAK this based on the discussion with upstream; it should be fixed in nm-applet instead, I'll make sure we drop the urgency of the disconnect messages to NORMAL or something to avoid it sticking around.

review: Disapprove

Unmerged revisions

49. By Timo Kluck on 2012-03-20

 - Treat transient, critical notifications the same as non-critical
   ones (notably the ubuntu-specific one that says "network disconnected,
   you are now offline") Closes: #883443
*

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-03-14 13:47:20 +0000
+++ .pc/applied-patches	2012-03-20 18:32:20 +0000
@@ -1,2 +1,3 @@
 04_remove-glx-dependency-on-armel.patch
 11-no-gettext.patch
+12-let-transient-critical-notifications-expire.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-14 13:47:20 +0000
+++ debian/changelog	2012-03-20 18:32:20 +0000
@@ -1,3 +1,13 @@
+gnome-shell (3.3.90-0ubuntu2) precise; urgency=low
+
+ * debian/12-let-transient-critical-notifications-expire.patch:
+   - Treat transient, critical notifications the same as non-critical
+     ones (notably the ubuntu-specific one that says "network disconnected,
+     you are now offline") Closes: #883443
+  * 
+
+ -- Timo Kluck <[e-mail]>  Tue, 20 Mar 2012 18:59:57 +0100
+
 gnome-shell (3.3.90-0ubuntu1) precise; urgency=low
 
   * Sync with Debian experimental svn packaging (LP: #941755, #937709).

=== added file 'debian/patches/12-let-transient-critical-notifications-expire.patch'
--- debian/patches/12-let-transient-critical-notifications-expire.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/12-let-transient-critical-notifications-expire.patch	2012-03-20 18:32:20 +0000
@@ -0,0 +1,31 @@
+Index: gnome-shell/js/ui/messageTray.js
+===================================================================
+--- gnome-shell.orig/js/ui/messageTray.js	2012-03-17 22:29:31.736548539 +0100
++++ gnome-shell/js/ui/messageTray.js	2012-03-20 18:34:06.452566807 +0100
+@@ -1978,7 +1978,7 @@
+         let notificationsPending = this._notificationQueue.length > 0 && (!this._busy || notificationUrgent);
+         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
+         let notificationExpanded = this._notificationBin.y < 0;
+-        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
++        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL && !this._notification.isTransient) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
+         let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
+ 
+         if (this._notificationState == State.HIDDEN) {
+@@ -2142,7 +2142,7 @@
+         // notification we are updating, in case that notification was already expanded and its height
+         // changed. Therefore we need to call this._expandNotification() for expanded notifications
+         // to make sure their position is updated.
+-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
++        if ((this._notification.urgency == Urgency.CRITICAL && !this._notification.isTransient) || this._notification.expanded)
+             this._expandNotification(true);
+ 
+         // We tween all notifications to full opacity. This ensures that both new notifications and
+@@ -2171,7 +2171,7 @@
+    },
+ 
+     _showNotificationCompleted: function() {
+-        if (this._notification.urgency != Urgency.CRITICAL)
++        if (this._notification.urgency != Urgency.CRITICAL || this._notification.isTransient)
+             this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
+     },
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-14 13:47:20 +0000
+++ debian/patches/series	2012-03-20 18:32:20 +0000
@@ -1,3 +1,4 @@
 04_remove-glx-dependency-on-armel.patch
 #10-make-NetworkManager-optional.patch
 11-no-gettext.patch
+12-let-transient-critical-notifications-expire.patch

=== modified file 'js/ui/messageTray.js'
--- js/ui/messageTray.js	2012-03-14 13:47:20 +0000
+++ js/ui/messageTray.js	2012-03-20 18:32:20 +0000
@@ -1978,7 +1978,7 @@
         let notificationsPending = this._notificationQueue.length > 0 && (!this._busy || notificationUrgent);
         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
         let notificationExpanded = this._notificationBin.y < 0;
-        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
+        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL && !this._notification.isTransient) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
         let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
 
         if (this._notificationState == State.HIDDEN) {
@@ -2142,7 +2142,7 @@
         // notification we are updating, in case that notification was already expanded and its height
         // changed. Therefore we need to call this._expandNotification() for expanded notifications
         // to make sure their position is updated.
-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
+        if ((this._notification.urgency == Urgency.CRITICAL && !this._notification.isTransient) || this._notification.expanded)
             this._expandNotification(true);
 
         // We tween all notifications to full opacity. This ensures that both new notifications and
@@ -2171,7 +2171,7 @@
    },
 
     _showNotificationCompleted: function() {
-        if (this._notification.urgency != Urgency.CRITICAL)
+        if (this._notification.urgency != Urgency.CRITICAL || this._notification.isTransient)
             this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
     },