[gnome-shell/gnome-3-28] messageTray: Re-enable unredirection when banner is destroyed

[Florian Müllner <fmuellner src gnome org>]

commit 5e7a7e31a108c572da54bd2c0b2ed68a5eb529ac
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Nov 22 18:18:34 2018 +0100

    messageTray: Re-enable unredirection when banner is destroyed
    
    The intention of commit 4dc20398 was to disable unredirection while
    banners are shown, but the ::done-displaying signal currently used for
    re-enabling unredirection is only emitted under some circumstances, so
    it's possible that unredirection is left disabled indefinitely, whoops.
    
    Fix this by tying disabling unredirection explicitly to the lifetime
    of the banner actor.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/issues/799
    
    (cherry picked from commit e5ce3d541e48dd75c9218312cd74ecb760ab857a)

 js/ui/messageTray.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index a0de45ade..3fdaaac86 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1307,10 +1307,8 @@ var MessageTray = new Lang.Class({
         }
 
         this._banner = this._notification.createBanner();
-        this._bannerClickedId = this._banner.connect('done-displaying', () => {
-            Meta.enable_unredirect_for_display(global.display);
-            this._escapeTray();
-        });
+        this._bannerClickedId = this._banner.connect('done-displaying',
+                                                     this._escapeTray.bind(this));
         this._bannerUnfocusedId = this._banner.connect('unfocused', () => {
             this._updateState();
         });
@@ -1460,6 +1458,7 @@ var MessageTray = new Lang.Class({
 
         this._pointerInNotification = false;
         this._notificationRemoved = false;
+        Meta.enable_unredirect_for_display(global.display);
 
         this._banner.actor.destroy();
         this._banner = null;