[gnome-shell/f18] Include regression fix missed in the 3.6.3 releas

[Florian Müllner]

commit 08030431563c9b4b7929de2a24c3bc60a6a05142
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Thu Feb 14 09:00:00 2013 +0100

    Include regression fix missed in the 3.6.3 releas

 ...ageTray-fix-notification-height-expansion.patch |   69 ++++++++++++++++++++
 gnome-shell.spec                                   |    7 ++-
 2 files changed, 75 insertions(+), 1 deletions(-)
---
diff --git a/0001-MessageTray-fix-notification-height-expansion.patch b/0001-MessageTray-fix-notification-height-expansion.patch
new file mode 100644
index 0000000..ba0167c
--- /dev/null
+++ b/0001-MessageTray-fix-notification-height-expansion.patch
@@ -0,0 +1,69 @@
+From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna at src.gnome.org>
+Date: Fri, 30 Nov 2012 16:05:38 +0100
+Subject: [PATCH] MessageTray: fix notification height expansion
+
+MessageTray._tween removes all tweens now, so it removes also
+those setting the height to expanded for critical notifications.
+
+This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689295
+---
+ js/ui/messageTray.js | 24 ++++++------------------
+ 1 file changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index ce61e25..ef0cc02 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
+     _updateShowingNotification: function() {
+         this._notification.acknowledged = true;
+ 
+-        Tweener.removeTweens(this._notificationWidget);
+-
+         // We auto-expand notifications with CRITICAL urgency.
+-        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
+-        // updating, in case that notification was in the process of being hidden. However,
+-        // Tweener.removeTweens() would also remove a tween that was updating the position of the
+-        // 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._expandNotification(true);
+ 
+         // We tween all notifications to full opacity. This ensures that both new notifications and
+         // notifications that might have been in the process of hiding get full opacity.
+         //
+-        // We tween any notification showing in the banner mode to banner height
+-        // (this._notificationWidget.y = -this._notificationWidget.height).
++        // We tween any notification showing in the banner mode to the appropriate height
++        // (which is banner height or expanded height, depending on the notification state)
+         // This ensures that both new notifications and notifications in the banner mode that might
+-        // have been in the process of hiding are shown with the banner height.
++        // have been in the process of hiding are shown with the correct height.
+         //
+         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
+         // notification is being shown.
+-        //
+-        // We don't set the y parameter for the tween for expanded notifications because
+-        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
+-        // fully expanded value.
++
+         let tweenParams = { opacity: 255,
++                            y: -this._notificationWidget.height,
+                             time: ANIMATION_TIME,
+                             transition: 'easeOutQuad',
+                             onComplete: this._showNotificationCompleted,
+                             onCompleteScope: this
+                           };
+-        if (!this._notification.expanded)
+-            tweenParams.y = -this._notificationWidget.height;
+ 
+         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
+    },
+-- 
+1.8.1.2
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index f062d64..e26b3ff 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@ Source0:        http://download.gnome.org/sources/gnome-shell/3.6/%{name}-%{vers
 
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
+Patch2: 0001-MessageTray-fix-notification-height-expansion.patch
 
 %define clutter_version 1.11.14-2
 %define gnome_bluetooth_version 3.5.5
@@ -102,6 +103,7 @@ easy to use experience.
 %prep
 %setup -q
 %patch1 -p1 -b .firefox
+%patch2 -p1 -b .notification-expansion
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -166,6 +168,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Thu Feb 14 2013 Florian Müllner <fmuellner at redhat.com> - 3.6.3-2
+- Include regression fix missed in 3.6.3 release
+
 * Wed Feb 13 2013 Florian Müllner <fmuellner at redhat.com> - 3.6.3-1
 - Update to 3.6.3