Merge lp:~darkxst/gnome-shell/lp1128804 into lp:ubuntu/raring/gnome-shell

[Tim Lunn]

update to new upstream release

[lp:~darkxst/gnome-shell/lp1128804]

70. By Tim Lunn on 2013-02-19

add missing patch

71. By Tim Lunn on 2013-02-19

remove dep3 comment from patch

=== modified file '.pc/11-no-gettext.patch/configure.ac'
--- .pc/11-no-gettext.patch/configure.ac	2012-11-12 23:11:33 +0000
+++ .pc/11-no-gettext.patch/configure.ac	2013-02-19 20:52:20 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.6.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])

=== modified file '.pc/14_make-GLX-optional.patch/configure.ac'
--- .pc/14_make-GLX-optional.patch/configure.ac	2012-11-12 23:11:33 +0000
+++ .pc/14_make-GLX-optional.patch/configure.ac	2013-02-19 20:52:20 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.6.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-01-31 14:53:11 +0000
+++ .pc/applied-patches	2013-02-19 20:52:20 +0000
@@ -5,7 +5,5 @@
 ubuntu-lightdm-user-switching.patch
 ubuntu_lock_on_suspend.patch
 git-set-ally-wm-theme.patch
-git_messagetray_opacity_fix.patch
-git_messagetray_remove_tweens.patch
 git_messagetray_fix_expansion.patch
-git_messagetray_hideNotification.patch
+calendar-remove-strict-check.patch

=== modified file '.pc/git_messagetray_fix_expansion.patch/js/ui/messageTray.js'
--- .pc/git_messagetray_fix_expansion.patch/js/ui/messageTray.js	2012-12-17 07:55:47 +0000
+++ .pc/git_messagetray_fix_expansion.patch/js/ui/messageTray.js	2013-02-19 20:52:20 +0000
@@ -2171,7 +2171,7 @@
                                                               Lang.bind(this, this._onIdleMonitorWatch));
         this._notificationClickedId = this._notification.connect('done-displaying',
                                                                  Lang.bind(this, this._escapeTray));
-        this._notification.connect('unfocused', Lang.bind(this, function() {
+        this._notificationUnfocusedId = this._notification.connect('unfocused', Lang.bind(this, function() {
             this._updateState();
         }));
         this._notificationBin.child = this._notification.actor;
@@ -2279,6 +2279,18 @@
     },
 
     _hideNotification: function() {
+        // HACK!
+        // There seems to be a reentrancy issue in calling .ungrab() here,
+        // which causes _updateState to be called before _notificationState
+        // becomes HIDING. That hides the notification again, nullifying the
+        // object but not setting _notificationState (and that's the weird part)
+        // As then _notificationState is stuck into SHOWN but _notification
+        // is null, every new _updateState fails and the message tray is
+        // lost forever.
+        //
+        // See more at https://bugzilla.gnome.org/show_bug.cgi?id=683986
+        this._notificationState = State.HIDING;
+
         this._grabHelper.ungrab({ actor: this._notification.actor });
 
         if (this._notificationExpandedId) {
@@ -2305,19 +2317,22 @@
     },
 
     _hideNotificationCompleted: function() {
-        this._notificationRemoved = false;
-        this._notificationWidget.hide();
-        this._closeButton.hide();
-        this._pointerInTray = false;
-        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
-        this._notificationBin.child = null;
         this._notification.collapseCompleted();
         this._notification.disconnect(this._notificationClickedId);
         this._notificationClickedId = 0;
+        this._notification.disconnect(this._notificationUnfocusedId);
+        this._notificationUnfocusedId = 0;
         let notification = this._notification;
         this._notification = null;
         if (notification.isTransient)
             notification.destroy(NotificationDestroyedReason.EXPIRED);
+
+        this._notificationRemoved = false;
+        this._closeButton.hide();
+        this._pointerInTray = false;
+        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
+        this._notificationBin.child = null;
+        this._notificationWidget.hide();
     },
 
     _expandNotification: function(autoExpanding) {

=== removed directory '.pc/git_messagetray_hideNotification.patch'
=== removed directory '.pc/git_messagetray_hideNotification.patch/js'
=== removed directory '.pc/git_messagetray_hideNotification.patch/js/ui'
=== removed file '.pc/git_messagetray_hideNotification.patch/js/ui/messageTray.js'
--- .pc/git_messagetray_hideNotification.patch/js/ui/messageTray.js	2013-01-31 14:53:11 +0000
+++ .pc/git_messagetray_hideNotification.patch/js/ui/messageTray.js	1970-01-01 00:00:00 +0000
@@ -1,2545 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Atk = imports.gi.Atk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const BoxPointer = imports.ui.boxpointer;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const GnomeSession = imports.misc.gnomeSession;
-const GrabHelper = imports.ui.grabHelper;
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const PointerWatcher = imports.ui.pointerWatcher;
-const PopupMenu = imports.ui.popupMenu;
-const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;
-
-const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
-
-const ANIMATION_TIME = 0.2;
-const NOTIFICATION_TIMEOUT = 4;
-const SUMMARY_TIMEOUT = 1;
-const LONGER_SUMMARY_TIMEOUT = 4;
-
-const HIDE_TIMEOUT = 0.2;
-const LONGER_HIDE_TIMEOUT = 0.6;
-
-const NOTIFICATION_ICON_SIZE = 24;
-
-// We delay hiding of the tray if the mouse is within MOUSE_LEFT_ACTOR_THRESHOLD
-// range from the point where it left the tray.
-const MOUSE_LEFT_ACTOR_THRESHOLD = 20;
-
-// Time the user needs to leave the mouse on the bottom pixel row to open the tray
-const TRAY_DWELL_TIME = 1000; // ms
-// Time resolution when tracking the mouse to catch the open tray dwell
-const TRAY_DWELL_CHECK_INTERVAL = 100; // ms
-
-const IDLE_TIME = 1000;
-
-const State = {
-    HIDDEN:  0,
-    SHOWING: 1,
-    SHOWN:   2,
-    HIDING:  3
-};
-
-// These reasons are useful when we destroy the notifications received through
-// the notification daemon. We use EXPIRED for transient notifications that the
-// user did not interact with, DISMISSED for all other notifications that were
-// destroyed as a result of a user action, and SOURCE_CLOSED for the notifications
-// that were requested to be destroyed by the associated source.
-const NotificationDestroyedReason = {
-    EXPIRED: 1,
-    DISMISSED: 2,
-    SOURCE_CLOSED: 3
-};
-
-// Message tray has its custom Urgency enumeration. LOW, NORMAL and CRITICAL
-// urgency values map to the corresponding values for the notifications received
-// through the notification daemon. HIGH urgency value is used for chats received
-// through the Telepathy client.
-const Urgency = {
-    LOW: 0,
-    NORMAL: 1,
-    HIGH: 2,
-    CRITICAL: 3
-}
-
-function _fixMarkup(text, allowMarkup) {
-    if (allowMarkup) {
-        // Support &, ", ', < and >, escape all other
-        // occurrences of '&'.
-        let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&');
-
-        // Support <b>, <i>, and <u>, escape anything else
-        // so it displays as raw markup.
-        _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
-
-        try {
-            Pango.parse_markup(_text, -1, '');
-            return _text;
-        } catch (e) {}
-    }
-
-    // !allowMarkup, or invalid markup
-    return GLib.markup_escape_text(text, -1);
-}
-
-const URLHighlighter = new Lang.Class({
-    Name: 'URLHighlighter',
-
-    _init: function(text, lineWrap, allowMarkup) {
-        if (!text)
-            text = '';
-        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
-        this._linkColor = '#ccccff';
-        this.actor.connect('style-changed', Lang.bind(this, function() {
-            let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
-            if (hasColor) {
-                let linkColor = color.to_string().substr(0, 7);
-                if (linkColor != this._linkColor) {
-                    this._linkColor = linkColor;
-                    this._highlightUrls();
-                }
-            }
-        }));
-        if (lineWrap) {
-            this.actor.clutter_text.line_wrap = true;
-            this.actor.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this.actor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        }
-
-        this.setMarkup(text, allowMarkup);
-        this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
-            // Don't try to URL highlight when invisible.
-            // The MessageTray doesn't actually hide us, so
-            // we need to check for paint opacities as well.
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            // Keep Notification.actor from seeing this and taking
-            // a pointer grab, which would block our button-release-event
-            // handler, if an URL is clicked
-            return this._findUrlAtPos(event) != -1;
-        }));
-        this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1) {
-                let url = this._urls[urlId].url;
-                if (url.indexOf(':') == -1)
-                    url = 'http://' + url;
-                try {
-                    Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-                    return true;
-                } catch (e) {
-                    // TODO: remove this after gnome 3 release
-                    Util.spawn(['gvfs-open', url]);
-                    return true;
-                }
-            }
-            return false;
-        }));
-        this.actor.connect('motion-event', Lang.bind(this, function(actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1 && !this._cursorChanged) {
-                global.set_cursor(Shell.Cursor.POINTING_HAND);
-                this._cursorChanged = true;
-            } else if (urlId == -1) {
-                global.unset_cursor();
-                this._cursorChanged = false;
-            }
-            return false;
-        }));
-        this.actor.connect('leave-event', Lang.bind(this, function() {
-            if (!this.actor.visible || this.actor.get_paint_opacity() == 0)
-                return;
-
-            if (this._cursorChanged) {
-                this._cursorChanged = false;
-                global.unset_cursor();
-            }
-        }));
-    },
-
-    setMarkup: function(text, allowMarkup) {
-        text = text ? _fixMarkup(text, allowMarkup) : '';
-        this._text = text;
-
-        this.actor.clutter_text.set_markup(text);
-        /* clutter_text.text contain text without markup */
-        this._urls = Util.findUrls(this.actor.clutter_text.text);
-        this._highlightUrls();
-    },
-
-    _highlightUrls: function() {
-        // text here contain markup
-        let urls = Util.findUrls(this._text);
-        let markup = '';
-        let pos = 0;
-        for (let i = 0; i < urls.length; i++) {
-            let url = urls[i];
-            let str = this._text.substr(pos, url.pos - pos);
-            markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
-            pos = url.pos + url.url.length;
-        }
-        markup += this._text.substr(pos);
-        this.actor.clutter_text.set_markup(markup);
-    },
-
-    _findUrlAtPos: function(event) {
-        let success;
-        let [x, y] = event.get_coords();
-        [success, x, y] = this.actor.transform_stage_point(x, y);
-        let find_pos = -1;
-        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
-            if (py > y || py + line_height < y || x < px)
-                continue;
-            find_pos = i;
-        }
-        if (find_pos != -1) {
-            for (let i = 0; i < this._urls.length; i++)
-            if (find_pos >= this._urls[i].pos &&
-                this._urls[i].pos + this._urls[i].url.length > find_pos)
-                return i;
-        }
-        return -1;
-    }
-});
-
-function makeCloseButton() {
-    let closeButton = new St.Button({ style_class: 'notification-close'});
-
-    // This is a bit tricky. St.Bin has its own x-align/y-align properties
-    // that compete with Clutter's properties. This should be fixed for
-    // Clutter 2.0. Since St.Bin doesn't define its own setters, the
-    // setters are a workaround to get Clutter's version.
-    closeButton.set_x_align(Clutter.ActorAlign.END);
-    closeButton.set_y_align(Clutter.ActorAlign.START);
-
-    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-    // to respect the alignments.
-    closeButton.set_x_expand(true);
-    closeButton.set_y_expand(true);
-
-    closeButton.connect('style-changed', function() {
-        let themeNode = closeButton.get_theme_node();
-
-        // libcroco doesn't support negative units
-        let direction = closeButton.get_text_direction() == Clutter.TextDirection.RTL ? -1 : 1;
-        closeButton.translation_x = direction * themeNode.get_length('-shell-close-overlap-x');
-
-        // libcroco doesn't support negative units
-        closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
-    });
-
-    return closeButton;
-}
-
-// Notification:
-// @source: the notification's Source
-// @title: the title
-// @banner: the banner text
-// @params: optional additional params
-//
-// Creates a notification. In the banner mode, the notification
-// will show an icon, @title (in bold) and @banner, all on a single
-// line (with @banner ellipsized if necessary).
-//
-// The notification will be expandable if either it has additional
-// elements that were added to it or if the @banner text did not
-// fit fully in the banner mode. When the notification is expanded,
-// the @banner text from the top line is always removed. The complete
-// @banner text is added as the first element in the content section,
-// unless 'customContent' parameter with the value 'true' is specified
-// in @params.
-//
-// Additional notification content can be added with addActor() and
-// addBody() methods. The notification content is put inside a
-// scrollview, so if it gets too tall, the notification will scroll
-// rather than continue to grow. In addition to this main content
-// area, there is also a single-row action area, which is not
-// scrolled and can contain a single actor. The action area can
-// be set by calling setActionArea() method. There is also a
-// convenience method addButton() for adding a button to the action
-// area.
-//
-// @params can contain values for 'customContent', 'body', 'icon',
-// 'titleMarkup', 'bannerMarkup', 'bodyMarkup', and 'clear'
-// parameters.
-//
-// If @params contains a 'customContent' parameter with the value %true,
-// then @banner will not be shown in the body of the notification when the
-// notification is expanded and calls to update() will not clear the content
-// unless 'clear' parameter with value %true is explicitly specified.
-//
-// If @params contains a 'body' parameter, then that text will be added to
-// the content area (as with addBody()).
-//
-// By default, the icon shown is created by calling
-// source.createIcon(). However, if @params contains an 'icon'
-// parameter, the passed in icon will be used.
-//
-// If @params contains a 'titleMarkup', 'bannerMarkup', or
-// 'bodyMarkup' parameter with the value %true, then the corresponding
-// element is assumed to use pango markup. If the parameter is not
-// present for an element, then anything that looks like markup in
-// that element will appear literally in the output.
-//
-// If @params contains a 'clear' parameter with the value %true, then
-// the content and the action area of the notification will be cleared.
-// The content area is also always cleared if 'customContent' is false
-// because it might contain the @banner that didn't fit in the banner mode.
-const Notification = new Lang.Class({
-    Name: 'Notification',
-
-    IMAGE_SIZE: 125,
-
-    _init: function(source, title, banner, params) {
-        this.source = source;
-        this.title = title;
-        this.urgency = Urgency.NORMAL;
-        this.resident = false;
-        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
-        this.isTransient = false;
-        this.expanded = false;
-        this.focused = false;
-        this.acknowledged = false;
-        this._destroyed = false;
-        this._useActionIcons = false;
-        this._customContent = false;
-        this._bannerBodyText = null;
-        this._bannerBodyMarkup = false;
-        this._titleFitsInBannerMode = true;
-        this._titleDirection = Clutter.TextDirection.DEFAULT;
-        this._spacing = 0;
-        this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
-        this._imageBin = null;
-
-        source.connect('destroy', Lang.bind(this,
-            function (source, reason) {
-                this.destroy(reason);
-            }));
-
-        this.actor = new St.Button({ accessible_role: Atk.Role.NOTIFICATION });
-        this.actor.add_style_class_name('notification-unexpanded');
-        this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._table = new St.Table({ style_class: 'notification',
-                                     reactive: true });
-        this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
-        this.actor.set_child(this._table);
-
-        // The first line should have the title, followed by the
-        // banner text, but ellipsized if they won't both fit. We can't
-        // make St.Table or St.BoxLayout do this the way we want (don't
-        // show banner at all if title needs to be ellipsized), so we
-        // use Shell.GenericContainer.
-        this._bannerBox = new Shell.GenericContainer();
-        this._bannerBox.connect('get-preferred-width', Lang.bind(this, this._bannerBoxGetPreferredWidth));
-        this._bannerBox.connect('get-preferred-height', Lang.bind(this, this._bannerBoxGetPreferredHeight));
-        this._bannerBox.connect('allocate', Lang.bind(this, this._bannerBoxAllocate));
-        this._table.add(this._bannerBox, { row: 0,
-                                           col: 1,
-                                           col_span: 2,
-                                           x_expand: false,
-                                           y_expand: false,
-                                           y_fill: false });
-
-        // This is an empty cell that overlaps with this._bannerBox cell to ensure
-        // that this._bannerBox cell expands horizontally, while not forcing the
-        // this._imageBin that is also in col: 2 to expand horizontally.
-        this._table.add(new St.Bin(), { row: 0,
-                                        col: 2,
-                                        y_expand: false,
-                                        y_fill: false });
-
-        this._titleLabel = new St.Label();
-        this._bannerBox.add_actor(this._titleLabel);
-        this._bannerUrlHighlighter = new URLHighlighter();
-        this._bannerLabel = this._bannerUrlHighlighter.actor;
-        this._bannerBox.add_actor(this._bannerLabel);
-
-        this.update(title, banner, params);
-    },
-
-    // update:
-    // @title: the new title
-    // @banner: the new banner
-    // @params: as in the Notification constructor
-    //
-    // Updates the notification by regenerating its icon and updating
-    // the title/banner. If @params.clear is %true, it will also
-    // remove any additional actors/action buttons previously added.
-    update: function(title, banner, params) {
-        params = Params.parse(params, { customContent: false,
-                                        body: null,
-                                        icon: null,
-                                        secondaryIcon: null,
-                                        titleMarkup: false,
-                                        bannerMarkup: false,
-                                        bodyMarkup: false,
-                                        clear: false });
-
-        this._customContent = params.customContent;
-
-        let oldFocus = global.stage.key_focus;
-
-        if (this._icon && (params.icon || params.clear)) {
-            this._icon.destroy();
-            this._icon = null;
-        }
-
-        if (this._secondaryIcon && (params.secondaryIcon || params.clear)) {
-            this._secondaryIcon.destroy();
-            this._secondaryIcon = null;
-        }
-
-        // We always clear the content area if we don't have custom
-        // content because it might contain the @banner that didn't
-        // fit in the banner mode.
-        if (this._scrollArea && (!this._customContent || params.clear)) {
-            if (oldFocus && this._scrollArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._scrollArea.destroy();
-            this._scrollArea = null;
-            this._contentArea = null;
-        }
-        if (this._actionArea && params.clear) {
-            if (oldFocus && this._actionArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._actionArea.destroy();
-            this._actionArea = null;
-            this._buttonBox = null;
-        }
-        if (this._imageBin && params.clear)
-            this.unsetImage();
-
-        if (!this._scrollArea && !this._actionArea && !this._imageBin)
-            this._table.remove_style_class_name('multi-line-notification');
-
-        if (!this._icon) {
-            this._icon = params.icon || this.source.createIcon(NOTIFICATION_ICON_SIZE);
-            this._table.add(this._icon, { row: 0,
-                                          col: 0,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          y_fill: false,
-                                          y_align: St.Align.START });
-        }
-
-        if (!this._secondaryIcon) {
-            this._secondaryIcon = params.secondaryIcon;
-
-            if (this._secondaryIcon)
-                this._bannerBox.add_actor(this._secondaryIcon);
-        }
-
-        this.title = title;
-        title = title ? _fixMarkup(title.replace(/\n/g, ' '), params.titleMarkup) : '';
-        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
-
-        if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
-            this._titleDirection = Clutter.TextDirection.RTL;
-        else
-            this._titleDirection = Clutter.TextDirection.LTR;
-
-        // Let the title's text direction control the overall direction
-        // of the notification - in case where different scripts are used
-        // in the notification, this is the right thing for the icon, and
-        // arguably for action buttons as well. Labels other than the title
-        // will be allocated at the available width, so that their alignment
-        // is done correctly automatically.
-        this._table.set_text_direction(this._titleDirection);
-
-        // Unless the notification has custom content, we save this._bannerBodyText
-        // to add it to the content of the notification if the notification is
-        // expandable due to other elements in its content area or due to the banner
-        // not fitting fully in the single-line mode.
-        this._bannerBodyText = this._customContent ? null : banner;
-        this._bannerBodyMarkup = params.bannerMarkup;
-
-        banner = banner ? banner.replace(/\n/g, '  ') : '';
-
-        this._bannerUrlHighlighter.setMarkup(banner, params.bannerMarkup);
-        this._bannerLabel.queue_relayout();
-
-        // Add the bannerBody now if we know for sure we'll need it
-        if (this._bannerBodyText && this._bannerBodyText.indexOf('\n') > -1)
-            this._addBannerBody();
-
-        if (params.body)
-            this.addBody(params.body, params.bodyMarkup);
-        this.updated();
-    },
-
-    setIconVisible: function(visible) {
-        this._icon.visible = visible;
-    },
-
-    enableScrolling: function(enableScrolling) {
-        this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea) {
-            this._scrollArea.vscrollbar_policy = this._scrollPolicy;
-            this._scrollArea.enable_mouse_scrolling = enableScrolling;
-        }
-    },
-
-    _createScrollArea: function() {
-        this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
-                                               vscrollbar_policy: this._scrollPolicy,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
-        this._table.add(this._scrollArea, { row: 1,
-                                            col: 2 });
-        this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
-                                               vertical: true });
-        this._scrollArea.add_actor(this._contentArea);
-        // If we know the notification will be expandable, we need to add
-        // the banner text to the body as the first element.
-        this._addBannerBody();
-    },
-
-    // addActor:
-    // @actor: actor to add to the body of the notification
-    //
-    // Appends @actor to the notification's body
-    addActor: function(actor, style) {
-        if (!this._scrollArea) {
-            this._createScrollArea();
-        }
-
-        this._contentArea.add(actor, style ? style : {});
-        this.updated();
-    },
-
-    // addBody:
-    // @text: the text
-    // @markup: %true if @text contains pango markup
-    // @style: style to use when adding the actor containing the text
-    //
-    // Adds a multi-line label containing @text to the notification.
-    //
-    // Return value: the newly-added label
-    addBody: function(text, markup, style) {
-        let label = new URLHighlighter(text, true, markup);
-
-        this.addActor(label.actor, style);
-        return label.actor;
-    },
-
-    _addBannerBody: function() {
-        if (this._bannerBodyText) {
-            let text = this._bannerBodyText;
-            this._bannerBodyText = null;
-            this.addBody(text, this._bannerBodyMarkup);
-        }
-    },
-
-    // scrollTo:
-    // @side: St.Side.TOP or St.Side.BOTTOM
-    //
-    // Scrolls the content area (if scrollable) to the indicated edge
-    scrollTo: function(side) {
-        let adjustment = this._scrollArea.vscroll.adjustment;
-        if (side == St.Side.TOP)
-            adjustment.value = adjustment.lower;
-        else if (side == St.Side.BOTTOM)
-            adjustment.value = adjustment.upper;
-    },
-
-    // setActionArea:
-    // @actor: the actor
-    // @props: (option) St.Table child properties
-    //
-    // Puts @actor into the action area of the notification, replacing
-    // the previous contents
-    setActionArea: function(actor, props) {
-        if (this._actionArea) {
-            this._actionArea.destroy();
-            this._actionArea = null;
-            if (this._buttonBox)
-                this._buttonBox = null;
-        } else {
-            this._addBannerBody();
-        }
-        this._actionArea = actor;
-
-        if (!props)
-            props = {};
-        props.row = 2;
-        props.col = 2;
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add(this._actionArea, props);
-        this._updateLastColumnSettings();
-        this.updated();
-    },
-
-    _updateLastColumnSettings: function() {
-        if (this._scrollArea)
-            this._table.child_set(this._scrollArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
-        if (this._actionArea)
-            this._table.child_set(this._actionArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
-    },
-
-    setImage: function(image) {
-        if (this._imageBin)
-            this.unsetImage();
-        this._imageBin = new St.Bin();
-        this._imageBin.child = image;
-        this._imageBin.opacity = 230;
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add_style_class_name('notification-with-image');
-        this._addBannerBody();
-        this._updateLastColumnSettings();
-        this._table.add(this._imageBin, { row: 1,
-                                          col: 1,
-                                          row_span: 2,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          x_fill: false,
-                                          y_fill: false });
-    },
-
-    unsetImage: function() {
-        if (this._imageBin) {
-            this._table.remove_style_class_name('notification-with-image');
-            this._table.remove_actor(this._imageBin);
-            this._imageBin = null;
-            this._updateLastColumnSettings();
-            if (!this._scrollArea && !this._actionArea)
-                this._table.remove_style_class_name('multi-line-notification');
-        }
-    },
-
-    // addButton:
-    // @id: the action ID
-    // @label: the label for the action's button
-    //
-    // Adds a button with the given @label to the notification. All
-    // action buttons will appear in a single row at the bottom of
-    // the notification.
-    //
-    // If the button is clicked, the notification will emit the
-    // %action-invoked signal with @id as a parameter
-    addButton: function(id, label) {
-        if (!this._buttonBox) {
-
-            let box = new St.BoxLayout({ style_class: 'notification-actions' });
-            this.setActionArea(box, { x_expand: false,
-                                      y_expand: false,
-                                      x_fill: false,
-                                      y_fill: false,
-                                      x_align: St.Align.END });
-            this._buttonBox = box;
-        }
-
-        let button = new St.Button({ can_focus: true });
-        button._actionId = id;
-
-        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
-            button.add_style_class_name('notification-icon-button');
-            button.child = new St.Icon({ icon_name: id });
-        } else {
-            button.add_style_class_name('notification-button');
-            button.label = label;
-        }
-
-        if (this._buttonBox.get_n_children() > 0)
-            global.focus_manager.remove_group(this._buttonBox);
-
-        this._buttonBox.add(button);
-        global.focus_manager.add_group(this._buttonBox);
-        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
-
-        this.updated();
-    },
-
-    // setButtonSensitive:
-    // @id: the action ID
-    // @sensitive: whether the button should be sensitive
-    //
-    // If the notification contains a button with action ID @id,
-    // its sensitivity will be set to @sensitive. Insensitive
-    // buttons cannot be clicked.
-    setButtonSensitive: function(id, sensitive) {
-        if (!this._buttonBox)
-            return;
-
-        let button = this._buttonBox.get_children().filter(function(b) {
-            return b._actionId == id;
-        })[0];
-
-        if (!button || button.reactive == sensitive)
-            return;
-
-        button.reactive = sensitive;
-    },
-
-    setUrgency: function(urgency) {
-        this.urgency = urgency;
-    },
-
-    setResident: function(resident) {
-        this.resident = resident;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
-    },
-
-    setUseActionIcons: function(useIcons) {
-        this._useActionIcons = useIcons;
-    },
-
-    _styleChanged: function() {
-        this._spacing = this._table.get_theme_node().get_length('spacing-columns');
-    },
-
-    _bannerBoxGetPreferredWidth: function(actor, forHeight, alloc) {
-        let [titleMin, titleNat] = this._titleLabel.get_preferred_width(forHeight);
-        let [bannerMin, bannerNat] = this._bannerLabel.get_preferred_width(forHeight);
-
-        if (this._secondaryIcon) {
-            let [secondaryIconMin, secondaryIconNat] = this._secondaryIcon.get_preferred_width(forHeight);
-
-            alloc.min_size = secondaryIconMin + this._spacing + titleMin;
-            alloc.natural_size = secondaryIconNat + this._spacing + titleNat + this._spacing + bannerNat;
-        } else {
-            alloc.min_size = titleMin;
-            alloc.natural_size = titleNat + this._spacing + bannerNat;
-        }
-    },
-
-    _bannerBoxGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] =
-            this._titleLabel.get_preferred_height(forWidth);
-    },
-
-    _bannerBoxAllocate: function(actor, box, flags) {
-        let availWidth = box.x2 - box.x1;
-
-        let [titleMinW, titleNatW] = this._titleLabel.get_preferred_width(-1);
-        let [titleMinH, titleNatH] = this._titleLabel.get_preferred_height(availWidth);
-        let [bannerMinW, bannerNatW] = this._bannerLabel.get_preferred_width(availWidth);
-
-        let rtl = (this._titleDirection == Clutter.TextDirection.RTL);
-        let x = rtl ? availWidth : 0;
-
-        if (this._secondaryIcon) {
-            let [iconMinW, iconNatW] = this._secondaryIcon.get_preferred_width(-1);
-            let [iconMinH, iconNatH] = this._secondaryIcon.get_preferred_height(availWidth);
-
-            let secondaryIconBox = new Clutter.ActorBox();
-            let secondaryIconBoxW = Math.min(iconNatW, availWidth);
-
-            // allocate secondary icon box
-            if (rtl) {
-                secondaryIconBox.x1 = x - secondaryIconBoxW;
-                secondaryIconBox.x2 = x;
-                x = x - (secondaryIconBoxW + this._spacing);
-            } else {
-                secondaryIconBox.x1 = x;
-                secondaryIconBox.x2 = x + secondaryIconBoxW;
-                x = x + secondaryIconBoxW + this._spacing;
-            }
-            secondaryIconBox.y1 = 0;
-            // Using titleNatH ensures that the secondary icon is centered vertically
-            secondaryIconBox.y2 = titleNatH;
-
-            availWidth = availWidth - (secondaryIconBoxW + this._spacing);
-            this._secondaryIcon.allocate(secondaryIconBox, flags);
-        }
-
-        let titleBox = new Clutter.ActorBox();
-        let titleBoxW = Math.min(titleNatW, availWidth);
-        if (rtl) {
-            titleBox.x1 = availWidth - titleBoxW;
-            titleBox.x2 = availWidth;
-        } else {
-            titleBox.x1 = x;
-            titleBox.x2 = titleBox.x1 + titleBoxW;
-        }
-        titleBox.y1 = 0;
-        titleBox.y2 = titleNatH;
-        this._titleLabel.allocate(titleBox, flags);
-        this._titleFitsInBannerMode = (titleNatW <= availWidth);
-
-        let bannerFits = true;
-        if (titleBoxW + this._spacing > availWidth) {
-            this._bannerLabel.opacity = 0;
-            bannerFits = false;
-        } else {
-            let bannerBox = new Clutter.ActorBox();
-
-            if (rtl) {
-                bannerBox.x1 = 0;
-                bannerBox.x2 = titleBox.x1 - this._spacing;
-
-                bannerFits = (bannerBox.x2 - bannerNatW >= 0);
-            } else {
-                bannerBox.x1 = titleBox.x2 + this._spacing;
-                bannerBox.x2 = availWidth;
-
-                bannerFits = (bannerBox.x1 + bannerNatW <= availWidth);
-            }
-            bannerBox.y1 = 0;
-            bannerBox.y2 = titleNatH;
-            this._bannerLabel.allocate(bannerBox, flags);
-
-            // Make _bannerLabel visible if the entire notification
-            // fits on one line, or if the notification is currently
-            // unexpanded and only showing one line anyway.
-            if (!this.expanded || (bannerFits && this._table.row_count == 1))
-                this._bannerLabel.opacity = 255;
-        }
-
-        // If the banner doesn't fully fit in the banner box, we possibly need to add the
-        // banner to the body. We can't do that from here though since that will force a
-        // relayout, so we add it to the main loop.
-        if (!bannerFits && this._canExpandContent())
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                           Lang.bind(this,
-                                     function() {
-                                        if (this._canExpandContent()) {
-                                            this._addBannerBody();
-                                            this._table.add_style_class_name('multi-line-notification');
-                                            this.updated();
-                                        }
-                                        return false;
-                                     }));
-    },
-
-    _canExpandContent: function() {
-        return this._bannerBodyText ||
-               (!this._titleFitsInBannerMode && !this._table.has_style_class_name('multi-line-notification'));
-    },
-
-    updated: function() {
-        if (this.expanded)
-            this.expand(false);
-    },
-
-    expand: function(animate) {
-        this.expanded = true;
-        this.actor.remove_style_class_name('notification-unexpanded');
-
-        // The banner is never shown when the title did not fit, so this
-        // can be an if-else statement.
-        if (!this._titleFitsInBannerMode) {
-            // Remove ellipsization from the title label and make it wrap so that
-            // we show the full title when the notification is expanded.
-            this._titleLabel.clutter_text.line_wrap = true;
-            this._titleLabel.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        } else if (this._table.row_count > 1 && this._bannerLabel.opacity != 0) {
-            // We always hide the banner if the notification has additional content.
-            //
-            // We don't need to wrap the banner that doesn't fit the way we wrap the
-            // title that doesn't fit because we won't have a notification with
-            // row_count=1 that has a banner that doesn't fully fit. We'll either add
-            // that banner to the content of the notification in _bannerBoxAllocate()
-            // or the notification will have custom content.
-            if (animate)
-                Tweener.addTween(this._bannerLabel,
-                                 { opacity: 0,
-                                   time: ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._bannerLabel.opacity = 0;
-        }
-        this.emit('expanded');
-    },
-
-    collapseCompleted: function() {
-        if (this._destroyed)
-            return;
-        this.expanded = false;
-        // Make sure we don't line wrap the title, and ellipsize it instead.
-        this._titleLabel.clutter_text.line_wrap = false;
-        this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-        // Restore banner opacity in case the notification is shown in the
-        // banner mode again on update.
-        this._bannerLabel.opacity = 255;
-        // Restore height requisition
-        this.actor.add_style_class_name('notification-unexpanded');
-        this.emit('collapsed');
-    },
-
-    _onActionInvoked: function(actor, mouseButtonClicked, id) {
-        this.emit('action-invoked', id);
-        if (!this.resident) {
-            // We don't hide a resident notification when the user invokes one of its actions,
-            // because it is common for such notifications to update themselves with new
-            // information based on the action. We'd like to display the updated information
-            // in place, rather than pop-up a new notification.
-            this.emit('done-displaying');
-            this.destroy();
-        }
-    },
-
-    _onClicked: function() {
-        this.emit('clicked');
-        // We hide all types of notifications once the user clicks on them because the common
-        // outcome of clicking should be the relevant window being brought forward and the user's
-        // attention switching to the window.
-        this.emit('done-displaying');
-        if (!this.resident)
-            this.destroy();
-    },
-
-    _onDestroy: function() {
-        if (this._destroyed)
-            return;
-        this._destroyed = true;
-        if (!this._destroyedReason)
-            this._destroyedReason = NotificationDestroyedReason.DISMISSED;
-        this.emit('destroy', this._destroyedReason);
-    },
-
-    destroy: function(reason) {
-        this._destroyedReason = reason;
-        this.actor.destroy();
-        this.actor._delegate = null;
-    }
-});
-Signals.addSignalMethods(Notification.prototype);
-
-const SourceActor = new Lang.Class({
-    Name: 'SourceActor',
-
-    _init: function(source, size) {
-        this._source = source;
-        this._size = size;
-
-        this.actor = new Shell.GenericContainer();
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.connect('destroy', Lang.bind(this, function() {
-            this._actorDestroyed = true;
-        }));
-        this._actorDestroyed = false;
-
-        this._counterLabel = new St.Label( {x_align: Clutter.ActorAlign.CENTER,
-                                            x_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER,
-                                            y_expand: true });
-
-        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel,
-                                        layout_manager: new Clutter.BinLayout() });
-        this._counterBin.hide();
-
-        this._counterBin.connect('style-changed', Lang.bind(this, function() {
-            let themeNode = this._counterBin.get_theme_node();
-            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
-            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
-        }));
-
-        this._iconBin = new St.Bin({ width: size,
-                                     height: size,
-                                     x_fill: true,
-                                     y_fill: true });
-
-        this.actor.add_actor(this._iconBin);
-        this.actor.add_actor(this._counterBin);
-
-        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
-        this._updateCount();
-
-        this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
-        this._updateIcon();
-    },
-
-    setIcon: function(icon) {
-        this._iconBin.child = icon;
-        this._iconSet = true;
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let [min, nat] = this._iconBin.get_preferred_width(forHeight);
-        alloc.min_size = min; alloc.nat_size = nat;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let [min, nat] = this._iconBin.get_preferred_height(forWidth);
-        alloc.min_size = min; alloc.nat_size = nat;
-    },
-
-    _allocate: function(actor, box, flags) {
-        // the iconBin should fill our entire box
-        this._iconBin.allocate(box, flags);
-
-        let childBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
-        let direction = this.actor.get_text_direction();
-
-        if (direction == Clutter.TextDirection.LTR) {
-            // allocate on the right in LTR
-            childBox.x1 = box.x2 - naturalWidth;
-            childBox.x2 = box.x2;
-        } else {
-            // allocate on the left in RTL
-            childBox.x1 = 0;
-            childBox.x2 = naturalWidth;
-        }
-
-        childBox.y1 = box.y2 - naturalHeight;
-        childBox.y2 = box.y2;
-
-        this._counterBin.allocate(childBox, flags);
-    },
-
-    _updateIcon: function() {
-        if (this._actorDestroyed)
-            return;
-
-        if (!this._iconSet)
-            this._iconBin.child = this._source.createIcon(this._size);
-    },
-
-    _updateCount: function() {
-        if (this._actorDestroyed)
-            return;
-
-        this._counterBin.visible = this._source.countVisible;
-
-        let text;
-        if (this._source.count < 100)
-            text = this._source.count.toString();
-        else
-            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
-
-        this._counterLabel.set_text(text);
-    }
-});
-
-const Source = new Lang.Class({
-    Name: 'MessageTraySource',
-
-    SOURCE_ICON_SIZE: 48,
-
-    _init: function(title, iconName) {
-        this.title = title;
-        this.iconName = iconName;
-
-        this.isTransient = false;
-        this.isChat = false;
-        this.isMuted = false;
-        this.showInLockScreen = true;
-        this.keepTrayOnSummaryClick = false;
-
-        this.notifications = [];
-    },
-
-    get count() {
-        return this.notifications.length;
-    },
-
-    get unseenCount() {
-        return this.notifications.filter(function(n) { return !n.acknowledged; }).length;
-    },
-
-    get countVisible() {
-        return this.count > 1;
-    },
-
-    countUpdated: function() {
-        this.emit('count-updated');
-    },
-
-    buildRightClickMenu: function() {
-        let item;
-        let rightClickMenu = new St.BoxLayout({ name: 'summary-right-click-menu',
-                                                vertical: true });
-
-        item = new PopupMenu.PopupMenuItem(_("Open"));
-        item.connect('activate', Lang.bind(this, function() {
-            this.open();
-            this.emit('done-displaying-content');
-        }));
-        rightClickMenu.add(item.actor);
-
-        item = new PopupMenu.PopupMenuItem(_("Remove"));
-        item.connect('activate', Lang.bind(this, function() {
-            this.destroy();
-            this.emit('done-displaying-content');
-        }));
-        rightClickMenu.add(item.actor);
-        return rightClickMenu;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
-    },
-
-    setTitle: function(newTitle) {
-        this.title = newTitle;
-        this.emit('title-changed');
-    },
-
-    setMuted: function(muted) {
-        if (!this.isChat || this.isMuted == muted)
-            return;
-        this.isMuted = muted;
-        this.emit('muted-changed');
-    },
-
-    // Called to create a new icon actor.
-    // Provides a sane default implementation, override if you need
-    // something more fancy.
-    createIcon: function(size) {
-        return new St.Icon({ icon_name: this.iconName,
-                             icon_size: size });
-    },
-
-    _ensureMainIcon: function() {
-        if (this._mainIcon)
-            return;
-
-        this._mainIcon = new SourceActor(this, this.SOURCE_ICON_SIZE);
-    },
-
-    // Unlike createIcon, this always returns the same actor;
-    // there is only one summary icon actor for a Source.
-    getSummaryIcon: function() {
-        this._ensureMainIcon();
-        return this._mainIcon.actor;
-    },
-
-    pushNotification: function(notification) {
-        if (this.notifications.indexOf(notification) < 0) {
-            this.notifications.push(notification);
-            this.emit('notification-added', notification);
-        }
-
-        notification.connect('clicked', Lang.bind(this, this.open));
-        notification.connect('destroy', Lang.bind(this,
-            function () {
-                let index = this.notifications.indexOf(notification);
-                if (index < 0)
-                    return;
-
-                this.notifications.splice(index, 1);
-                if (this.notifications.length == 0)
-                    this._lastNotificationRemoved();
-
-                this.countUpdated();
-            }));
-
-        this.countUpdated();
-    },
-
-    notify: function(notification) {
-        notification.acknowledged = false;
-        this.pushNotification(notification);
-        if (!this.isMuted)
-             this.emit('notify', notification);
-    },
-
-    destroy: function(reason) {
-        this.emit('destroy', reason);
-    },
-
-    // A subclass can redefine this to "steal" clicks from the
-    // summaryitem; Use Clutter.get_current_event() to get the
-    // details, return true to prevent the default handling from
-    // ocurring.
-    handleSummaryClick: function() {
-        return false;
-    },
-
-    iconUpdated: function() {
-        this.emit('icon-updated');
-    },
-
-    //// Protected methods ////
-    _setSummaryIcon: function(icon) {
-        this._ensureMainIcon();
-        this._mainIcon.setIcon(icon);
-        this.iconUpdated();
-    },
-
-    open: function(notification) {
-        this.emit('opened', notification);
-    },
-
-    destroyNonResidentNotifications: function() {
-        for (let i = this.notifications.length - 1; i >= 0; i--)
-            if (!this.notifications[i].resident)
-                this.notifications[i].destroy();
-
-        this.countUpdated();
-    },
-
-    // Default implementation is to destroy this source, but subclasses can override
-    _lastNotificationRemoved: function() {
-        this.destroy();
-    },
-
-    hasResidentNotification: function() {
-        return this.notifications.some(function(n) { return n.resident; });
-    }
-});
-Signals.addSignalMethods(Source.prototype);
-
-const SummaryItem = new Lang.Class({
-    Name: 'SummaryItem',
-
-    _init: function(source) {
-        this.source = source;
-        this.source.connect('notification-added', Lang.bind(this, this._notificationAddedToSource));
-
-        this.actor = new St.Button({ style_class: 'summary-source-button',
-                                     y_fill: true,
-                                     reactive: true,
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO | St.ButtonMask.THREE,
-                                     can_focus: true,
-                                     track_hover: true });
-        this.actor.label_actor = new St.Label({ text: source.title });
-        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
-        this._sourceBox = new St.BoxLayout({ style_class: 'summary-source' });
-
-        this._sourceIcon = source.getSummaryIcon();
-        this._sourceBox.add(this._sourceIcon, { y_fill: false });
-        this.actor.child = this._sourceBox;
-
-        this.notificationStackWidget = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-
-        this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
-                                                         vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
-                                                         hscrollbar_policy: Gtk.PolicyType.NEVER });
-        this.notificationStackView.add_style_class_name('vfade');
-        this.notificationStack = new St.BoxLayout({ style_class: 'summary-notification-stack',
-                                                    vertical: true });
-        this.notificationStackView.add_actor(this.notificationStack);
-        this.notificationStackWidget.add_actor(this.notificationStackView);
-
-        this.closeButton = makeCloseButton();
-        this.notificationStackWidget.add_actor(this.closeButton);
-        this._stackedNotifications = [];
-
-        this._oldMaxScrollAdjustment = 0;
-
-        this.notificationStackView.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
-                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
-        }));
-
-        this.rightClickMenu = source.buildRightClickMenu();
-        if (this.rightClickMenu)
-            global.focus_manager.add_group(this.rightClickMenu);
-    },
-
-    _onKeyPress: function(actor, event) {
-        if (event.get_key_symbol() == Clutter.KEY_Up) {
-            actor.emit('clicked', 1);
-            return true;
-        }
-        return false;
-    },
-
-    prepareNotificationStackForShowing: function() {
-        if (this.notificationStack.get_n_children() > 0)
-            return;
-
-        for (let i = 0; i < this.source.notifications.length; i++) {
-            this._appendNotificationToStack(this.source.notifications[i]);
-        }
-
-        this.scrollTo(St.Side.BOTTOM);
-    },
-
-    doneShowingNotificationStack: function() {
-        for (let i = 0; i < this._stackedNotifications.length; i++) {
-            let stackedNotification = this._stackedNotifications[i];
-            let notification = stackedNotification.notification;
-            notification.collapseCompleted();
-            notification.disconnect(stackedNotification.notificationExpandedId);
-            notification.disconnect(stackedNotification.notificationDoneDisplayingId);
-            notification.disconnect(stackedNotification.notificationDestroyedId);
-            if (notification.actor.get_parent() == this.notificationStack)
-                this.notificationStack.remove_actor(notification.actor);
-            notification.setIconVisible(true);
-            notification.enableScrolling(true);
-        }
-        this._stackedNotifications = [];
-    },
-
-    _notificationAddedToSource: function(source, notification) {
-        if (this.notificationStack.mapped)
-            this._appendNotificationToStack(notification);
-    },
-
-    _appendNotificationToStack: function(notification) {
-        let stackedNotification = {};
-        stackedNotification.notification = notification;
-        stackedNotification.notificationExpandedId = notification.connect('expanded', Lang.bind(this, this._contentUpdated));
-        stackedNotification.notificationDoneDisplayingId = notification.connect('done-displaying', Lang.bind(this, this._notificationDoneDisplaying));
-        stackedNotification.notificationDestroyedId = notification.connect('destroy', Lang.bind(this, this._notificationDestroyed));
-        this._stackedNotifications.push(stackedNotification);
-        if (!this.source.isChat)
-            notification.enableScrolling(false);
-        if (this.notificationStack.get_n_children() > 0)
-            notification.setIconVisible(false);
-        this.notificationStack.add(notification.actor);
-        notification.expand(false);
-    },
-
-    // scrollTo:
-    // @side: St.Side.TOP or St.Side.BOTTOM
-    //
-    // Scrolls the notifiction stack to the indicated edge
-    scrollTo: function(side) {
-        let adjustment = this.notificationStackView.vscroll.adjustment;
-        if (side == St.Side.TOP)
-            adjustment.value = adjustment.lower;
-        else if (side == St.Side.BOTTOM)
-            adjustment.value = adjustment.upper;
-    },
-
-    _contentUpdated: function() {
-        this.emit('content-updated');
-    },
-
-    _notificationDoneDisplaying: function() {
-        this.source.emit('done-displaying-content');
-    },
-
-    _notificationDestroyed: function(notification) {
-        for (let i = 0; i < this._stackedNotifications.length; i++) {
-            if (this._stackedNotifications[i].notification == notification) {
-                let stackedNotification = this._stackedNotifications[i];
-                notification.disconnect(stackedNotification.notificationExpandedId);
-                notification.disconnect(stackedNotification.notificationDoneDisplayingId);
-                notification.disconnect(stackedNotification.notificationDestroyedId);
-                this._stackedNotifications.splice(i, 1);
-                if (notification.actor.get_parent() == this.notificationStack)
-                    this.notificationStack.remove_actor(notification.actor);
-                this._contentUpdated();
-                break;
-            }
-        }
-
-        let firstNotification = this._stackedNotifications[0];
-        if (firstNotification)
-            firstNotification.notification.setIconVisible(true);
-    }
-});
-Signals.addSignalMethods(SummaryItem.prototype);
-
-const MessageTray = new Lang.Class({
-    Name: 'MessageTray',
-
-    _init: function() {
-        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
-            this._onStatusChanged(proxy.status);
-        }));
-        this._busy = false;
-        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-            this._onStatusChanged(status);
-        }));
-
-        this.actor = new St.Widget({ name: 'message-tray',
-                                     reactive: true,
-                                     track_hover: true,
-                                     layout_manager: new Clutter.BinLayout(),
-                                     x_expand: true,
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.START,
-                                   });
-        this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
-
-        this._notificationWidget = new St.Widget({ name: 'notification-container',
-                                                   y_align: Clutter.ActorAlign.START,
-                                                   x_align: Clutter.ActorAlign.CENTER,
-                                                   y_expand: true,
-                                                   x_expand: true,
-                                                   layout_manager: new Clutter.BinLayout() });
-        this.actor.add_actor(this._notificationWidget);
-
-        this._notificationBin = new St.Bin({ y_expand: true });
-        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
-        this._notificationWidget.add_actor(this._notificationBin);
-        this._notificationWidget.hide();
-        this._notificationQueue = [];
-        this._notification = null;
-        this._notificationClickedId = 0;
-
-        this.actor.connect('button-release-event', Lang.bind(this, function(actor, event) {
-            this._setClickedSummaryItem(null);
-            this._updateState();
-            actor.grab_key_focus();
-        }));
-        global.focus_manager.add_group(this.actor);
-        this._summary = new St.BoxLayout({ name: 'summary-mode',
-                                           reactive: true,
-                                           track_hover: true,
-                                           x_align: Clutter.ActorAlign.END,
-                                           x_expand: true,
-                                           y_align: Clutter.ActorAlign.CENTER,
-                                           y_expand: true });
-        this._summary.connect('notify::hover', Lang.bind(this, this._onSummaryHoverChanged));
-        this.actor.add_actor(this._summary);
-        this._summary.opacity = 0;
-
-        this._summaryMotionId = 0;
-        this._trayMotionId = 0;
-
-        this._summaryBoxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
-                                                            { reactive: true,
-                                                              track_hover: true });
-        this._summaryBoxPointer.actor.connect('key-press-event',
-                                              Lang.bind(this, this._onSummaryBoxPointerKeyPress));
-        this._summaryBoxPointer.actor.style_class = 'summary-boxpointer';
-        this._summaryBoxPointer.actor.hide();
-        Main.layoutManager.addChrome(this._summaryBoxPointer.actor);
-
-        this._summaryBoxPointerItem = null;
-        this._summaryBoxPointerContentUpdatedId = 0;
-        this._summaryBoxPointerDoneDisplayingId = 0;
-        this._clickedSummaryItem = null;
-        this._clickedSummaryItemMouseButton = -1;
-        this._clickedSummaryItemAllocationChangedId = 0;
-        this._pointerBarrier = 0;
-
-        this._closeButton = makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
-        this._notificationWidget.add_actor(this._closeButton);
-
-        this._idleMonitorWatchId = 0;
-        this._userActiveWhileNotificationShown = false;
-
-        this.idleMonitor = Shell.IdleMonitor.get();
-
-        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
-        this._grabHelper.addActor(this._summaryBoxPointer.actor);
-        this._grabHelper.addActor(this.actor);
-        if (Main.panel.statusArea.activities)
-            this._grabHelper.addActor(Main.panel.statusArea.activities.hotCorner.actor);
-
-        Main.layoutManager.keyboardBox.connect('notify::hover', Lang.bind(this, this._onKeyboardHoverChanged));
-        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, this._onKeyboardVisibleChanged));
-
-        this._trayState = State.HIDDEN;
-        this._locked = false;
-        this._traySummoned = false;
-        this._useLongerTrayLeftTimeout = false;
-        this._trayLeftTimeoutId = 0;
-        this._pointerInTray = false;
-        this._pointerInKeyboard = false;
-        this._keyboardVisible = false;
-        this._summaryState = State.HIDDEN;
-        this._pointerInSummary = false;
-        this._notificationClosed = false;
-        this._notificationState = State.HIDDEN;
-        this._notificationTimeoutId = 0;
-        this._notificationExpandedId = 0;
-        this._summaryBoxPointerState = State.HIDDEN;
-        this._summaryBoxPointerTimeoutId = 0;
-        this._desktopCloneState = State.HIDDEN;
-        this._overviewVisible = Main.overview.visible;
-        this._notificationRemoved = false;
-        this._reNotifyAfterHideNotification = null;
-        this._inFullscreen = false;
-        this._desktopClone = null;
-
-        this._lightbox = new Lightbox.Lightbox(global.window_group,
-                                               { inhibitEvents: true,
-                                                 fadeInTime: ANIMATION_TIME,
-                                                 fadeOutTime: ANIMATION_TIME,
-                                                 fadeFactor: 0.2
-                                               });
-
-        Main.layoutManager.trayBox.add_actor(this.actor);
-        this.actor.y = 0;
-        Main.layoutManager.trackChrome(this.actor);
-        Main.layoutManager.trackChrome(this._notificationWidget);
-        Main.layoutManager.trackChrome(this._closeButton);
-
-        Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
-
-        Main.overview.connect('showing', Lang.bind(this,
-            function() {
-                this._overviewVisible = true;
-                this._grabHelper.ungrab(); // drop modal grab if necessary
-                this.actor.add_style_pseudo_class('overview');
-                this._updateState();
-            }));
-        Main.overview.connect('hiding', Lang.bind(this,
-            function() {
-                this._overviewVisible = false;
-                this._escapeTray();
-                this.actor.remove_style_pseudo_class('overview');
-                this._updateState();
-            }));
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-
-        global.display.add_keybinding('toggle-message-tray',
-                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                                      Meta.KeyBindingFlags.NONE,
-                                      Lang.bind(this, this.toggleAndNavigate));
-
-        this._summaryItems = [];
-        this._chatSummaryItemsCount = 0;
-
-        let pointerWatcher = PointerWatcher.getPointerWatcher();
-        pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
-        this._trayDwellTimeoutId = 0;
-        this._trayDwelling = false;
-        this._trayDwellUserTime = 0;
-
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        if (Main.sessionMode.isLocked || Main.sessionMode.isGreeter)
-            Main.ctrlAltTabManager.removeGroup(this._summary);
-        else
-            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
-                                            { focusCallback: Lang.bind(this, this.toggleAndNavigate),
-                                              sortGroup: CtrlAltTab.SortGroup.BOTTOM });
-        this._updateState();
-    },
-
-    _checkTrayDwell: function(x, y) {
-        let monitor = Main.layoutManager.bottomMonitor;
-        let shouldDwell = (x >= monitor.x && x <= monitor.x + monitor.width &&
-                           y == monitor.y + monitor.height - 1);
-        if (shouldDwell) {
-            // We only set up dwell timeout when the user is not hovering over the tray
-            // (!this.actor.hover). This avoids bringing up the message tray after the
-            // user clicks on a notification with the pointer on the bottom pixel
-            // of the monitor. The _trayDwelling variable is used so that we only try to
-            // fire off one tray dwell - if it fails (because, say, the user has the mouse down),
-            // we don't try again until the user moves the mouse up and down again.
-            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0) {
-                // Save the interaction timestamp so we can detect user input
-                let focusWindow = global.display.focus_window;
-                this._trayDwellUserTime = focusWindow ? focusWindow.user_time : 0;
-
-                this._trayDwellTimeoutId = Mainloop.timeout_add(TRAY_DWELL_TIME,
-                                                                Lang.bind(this, this._trayDwellTimeout));
-            }
-            this._trayDwelling = true;
-        } else {
-            this._cancelTrayDwell();
-            this._trayDwelling = false;
-        }
-    },
-
-    _cancelTrayDwell: function() {
-        if (this._trayDwellTimeoutId != 0) {
-            Mainloop.source_remove(this._trayDwellTimeoutId);
-            this._trayDwellTimeoutId = 0;
-        }
-    },
-
-    _trayDwellTimeout: function() {
-        if (Main.modalCount > 0)
-            return false;
-
-        // If the user interacted with the focus window since we started the tray
-        // dwell (by clicking or typing), don't activate the message tray
-        let focusWindow = global.display.focus_window;
-        let currentUserTime = focusWindow ? focusWindow.user_time : 0;
-        if (currentUserTime != this._trayDwellUserTime)
-            return false;
-
-        this._trayDwellTimeoutId = 0;
-
-        this._traySummoned = true;
-        this._updateState();
-
-        return false;
-    },
-
-    _onCloseClicked: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notificationClosed = true;
-            this._updateState();
-            this._notificationClosed = false;
-        }
-    },
-
-    contains: function(source) {
-        return this._getIndexOfSummaryItemForSource(source) >= 0;
-    },
-
-    _getIndexOfSummaryItemForSource: function(source) {
-        for (let i = 0; i < this._summaryItems.length; i++) {
-            if (this._summaryItems[i].source == source)
-                return i;
-        }
-        return -1;
-    },
-
-    add: function(source) {
-        if (this.contains(source)) {
-            log('Trying to re-add source ' + source.title);
-            return;
-        }
-
-        let summaryItem = new SummaryItem(source);
-
-        if (source.isChat) {
-            this._summary.insert_child_at_index(summaryItem.actor, 0);
-            this._chatSummaryItemsCount++;
-        } else {
-            this._summary.insert_child_at_index(summaryItem.actor, this._chatSummaryItemsCount);
-        }
-
-        this._summaryItems.push(summaryItem);
-
-        source.connect('notify', Lang.bind(this, this._onNotify));
-
-        source.connect('muted-changed', Lang.bind(this,
-            function () {
-                if (source.isMuted)
-                    this._notificationQueue = this._notificationQueue.filter(function(notification) {
-                        return source != notification.source;
-                    });
-            }));
-
-        summaryItem.actor.connect('clicked', Lang.bind(this,
-            function(actor, button) {
-                actor.grab_key_focus();
-                this._onSummaryItemClicked(summaryItem, button);
-            }));
-        summaryItem.actor.connect('popup-menu', Lang.bind(this,
-            function(actor, button) {
-                actor.grab_key_focus();
-                this._onSummaryItemClicked(summaryItem, 3);
-            }));
-
-        source.connect('destroy', Lang.bind(this, this._onSourceDestroy));
-
-        // We need to display the newly-added summary item, but if the
-        // caller is about to post a notification, we want to show that
-        // *first* and not show the summary item until after it hides.
-        // So postpone calling _updateState() a tiny bit.
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { this._updateState(); return false; }));
-
-        this.emit('summary-item-added', summaryItem);
-    },
-
-    getSummaryItems: function() {
-        return this._summaryItems;
-    },
-
-    _onSourceDestroy: function(source) {
-        let index = this._getIndexOfSummaryItemForSource(source);
-        if (index == -1)
-            return;
-
-        let summaryItemToRemove = this._summaryItems[index];
-
-        this._summaryItems.splice(index, 1);
-
-        if (source.isChat)
-            this._chatSummaryItemsCount--;
-
-        let needUpdate = false;
-
-        if (this._notification && this._notification.source == source) {
-            this._updateNotificationTimeout(0);
-            this._notificationRemoved = true;
-            needUpdate = true;
-        }
-        if (this._clickedSummaryItem == summaryItemToRemove) {
-            this._setClickedSummaryItem(null);
-            needUpdate = true;
-        }
-
-        summaryItemToRemove.actor.destroy();
-
-        if (needUpdate)
-            this._updateState();
-    },
-
-    _onNotificationDestroy: function(notification) {
-        if (this._notification == notification && (this._notificationState == State.SHOWN || this._notificationState == State.SHOWING)) {
-            this._updateNotificationTimeout(0);
-            this._notificationRemoved = true;
-            this._updateState();
-            return;
-        }
-
-        let index = this._notificationQueue.indexOf(notification);
-        notification.destroy();
-        if (index != -1)
-            this._notificationQueue.splice(index, 1);
-    },
-
-    _lock: function() {
-        this._locked = true;
-    },
-
-    _unlock: function() {
-        if (!this._locked)
-            return;
-        this._locked = false;
-        this._pointerInTray = this.actor.hover;
-        this._updateState();
-    },
-
-    toggle: function() {
-        this._traySummoned = !this._traySummoned;
-        this._updateState();
-    },
-
-    toggleAndNavigate: function() {
-        this.toggle();
-        this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
-    hide: function() {
-        this._traySummoned = false;
-        this.actor.set_hover(false);
-        this._summary.set_hover(false);
-        this._updateState();
-    },
-
-    _onNotify: function(source, notification) {
-        if (this._summaryBoxPointerItem && this._summaryBoxPointerItem.source == source) {
-            if (this._summaryBoxPointerState == State.HIDING) {
-                // We are in the process of hiding the summary box pointer.
-                // If there is an update for one of the notifications or
-                // a new notification to be added to the notification stack
-                // while it is in the process of being hidden, we show it as
-                // a new notification. However, we first wait till the hide
-                // is complete. This is especially important if one of the
-                // notifications in the stack was updated because we will
-                // need to be able to re-parent its actor to a different
-                // part of the stage.
-                this._reNotifyAfterHideNotification = notification;
-            } else {
-                // The summary box pointer is showing or shown (otherwise,
-                // this._summaryBoxPointerItem would be null)
-                // Immediately mark the notification as acknowledged, as it's
-                // not going into the queue
-                notification.acknowledged = true;
-            }
-
-            return;
-        }
-
-        if (this._notification == notification) {
-            // If a notification that is being shown is updated, we update
-            // how it is shown and extend the time until it auto-hides.
-            // If a new notification is updated while it is being hidden,
-            // we stop hiding it and show it again.
-            this._updateShowingNotification();
-        } else if (this._notificationQueue.indexOf(notification) < 0) {
-            notification.connect('destroy',
-                                 Lang.bind(this, this._onNotificationDestroy));
-            this._notificationQueue.push(notification);
-            this._notificationQueue.sort(function(notification1, notification2) {
-                return (notification2.urgency - notification1.urgency);
-            });
-        }
-        this._updateState();
-    },
-
-    _onSummaryItemClicked: function(summaryItem, button) {
-        if (summaryItem.source.handleSummaryClick()) {
-            if (summaryItem.source.keepTrayOnSummaryClick)
-                this._setClickedSummaryItem(null);
-            else
-                this._escapeTray();
-        } else {
-            if (!this._setClickedSummaryItem(summaryItem, button))
-                this._setClickedSummaryItem(null);
-        }
-
-        this._updateState();
-    },
-
-    _onSummaryHoverChanged: function() {
-        this._pointerInSummary = this._summary.hover;
-        this._updateState();
-    },
-
-    _onTrayHoverChanged: function() {
-        if (this.actor.hover) {
-            // No dwell inside notifications at the bottom of the screen
-            this._cancelTrayDwell();
-
-            // Don't do anything if the one pixel area at the bottom is hovered over while the tray is hidden.
-            if (this._trayState == State.HIDDEN && this._notificationState == State.HIDDEN)
-                return;
-
-            // Don't do anything if this._useLongerTrayLeftTimeout is true, meaning the notification originally
-            // popped up under the pointer, but this._trayLeftTimeoutId is 0, meaning the pointer didn't leave
-            // the tray yet. We need to check for this case because sometimes _onTrayHoverChanged() gets called
-            // multiple times while this.actor.hover is true.
-            if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId)
-                return;
-
-            this._useLongerTrayLeftTimeout = false;
-            if (this._trayLeftTimeoutId) {
-                Mainloop.source_remove(this._trayLeftTimeoutId);
-                this._trayLeftTimeoutId = 0;
-                this._trayLeftMouseX = -1;
-                this._trayLeftMouseY = -1;
-                return;
-            }
-
-            if (this._showNotificationMouseX >= 0) {
-                let actorAtShowNotificationPosition =
-                    global.stage.get_actor_at_pos(Clutter.PickMode.ALL, this._showNotificationMouseX, this._showNotificationMouseY);
-                this._showNotificationMouseX = -1;
-                this._showNotificationMouseY = -1;
-                // Don't set this._pointerInTray to true if the pointer was initially in the area where the notification
-                // popped up. That way we will not be expanding notifications that happen to pop up over the pointer
-                // automatically. Instead, the user is able to expand the notification by mousing away from it and then
-                // mousing back in. Because this is an expected action, we set the boolean flag that indicates that a longer
-                // timeout should be used before popping down the notification.
-                if (this.actor.contains(actorAtShowNotificationPosition)) {
-                    this._useLongerTrayLeftTimeout = true;
-                    return;
-                }
-            }
-            this._pointerInTray = true;
-            this._updateState();
-        } else {
-            // We record the position of the mouse the moment it leaves the tray. These coordinates are used in
-            // this._onTrayLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
-            // to consider that the user intended to leave the tray and therefore hide the tray. If the mouse is still
-            // close to its previous position, we extend the timeout once.
-            let [x, y, mods] = global.get_pointer();
-            this._trayLeftMouseX = x;
-            this._trayLeftMouseY = y;
-
-            // We wait just a little before hiding the message tray in case the user quickly moves the mouse back into it.
-            // We wait for a longer period if the notification popped up where the mouse pointer was already positioned.
-            // That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
-            let timeout = this._useLongerTrayLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
-            this._trayLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onTrayLeftTimeout));
-        }
-    },
-
-    _onKeyboardHoverChanged: function(keyboard) {
-        this._pointerInKeyboard = keyboard.hover;
-
-        if (!keyboard.hover) {
-            let event = Clutter.get_current_event();
-            if (event && event.type() == Clutter.EventType.LEAVE) {
-                let into = event.get_related();
-                if (into && this.actor.contains(into)) {
-                    // Don't call _updateState, because pointerInTray is
-                    // still false
-                    return;
-                }
-            }
-        }
-
-        this._updateState();
-    },
-
-    _onKeyboardVisibleChanged: function(layoutManager, keyboardVisible) {
-        if (this._keyboardVisible == keyboardVisible)
-            return;
-
-        this._keyboardVisible = keyboardVisible;
-
-        if (keyboardVisible)
-            this.actor.add_style_pseudo_class('keyboard');
-        else
-            this.actor.remove_style_pseudo_class('keyboard');
-
-        this._updateState();
-    },
-
-    _onFullscreenChanged: function(obj, state) {
-        this._inFullscreen = state;
-        this._updateState();
-    },
-
-    _onStatusChanged: function(status) {
-        if (status == GnomeSession.PresenceStatus.BUSY) {
-            // remove notification and allow the summary to be closed now
-            this._updateNotificationTimeout(0);
-            this._busy = true;
-        } else if (status != GnomeSession.PresenceStatus.IDLE) {
-            // We preserve the previous value of this._busy if the status turns to IDLE
-            // so that we don't start showing notifications queued during the BUSY state
-            // as the screensaver gets activated.
-            this._busy = false;
-        }
-
-        this._updateState();
-    },
-
-    _onTrayLeftTimeout: function() {
-        let [x, y, mods] = global.get_pointer();
-        // We extend the timeout once if the mouse moved no further than MOUSE_LEFT_ACTOR_THRESHOLD to either side or up.
-        // We don't check how far down the mouse moved because any point above the tray, but below the exit coordinate,
-        // is close to the tray.
-        if (this._trayLeftMouseX > -1 &&
-            y > this._trayLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x < this._trayLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x > this._trayLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
-            this._trayLeftMouseX = -1;
-            this._trayLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
-                                                             Lang.bind(this, this._onTrayLeftTimeout));
-        } else {
-            this._trayLeftTimeoutId = 0;
-            this._useLongerTrayLeftTimeout = false;
-            this._pointerInTray = false;
-            this._pointerInSummary = false;
-            this._updateNotificationTimeout(0);
-            this._updateState();
-        }
-        return false;
-    },
-
-    _escapeTray: function() {
-        this._unlock();
-        this._pointerInTray = false;
-        this._pointerInSummary = false;
-        this._traySummoned = false;
-        this._setClickedSummaryItem(null);
-        this._updateNotificationTimeout(0);
-        this._updateState();
-    },
-
-    // All of the logic for what happens when occurs here; the various
-    // event handlers merely update variables such as
-    // 'this._pointerInTray', 'this._summaryState', etc, and
-    // _updateState() figures out what (if anything) needs to be done
-    // at the present time.
-    _updateState: function() {
-        // Notifications
-        let notificationQueue = this._notificationQueue;
-        let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationsLimited = this._busy || this._inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
-        let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
-        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
-        let notificationExpanded = this._notification && this._notification.expanded;
-        let notificationExpired = this._notificationTimeoutId == 0 &&
-                                  !(this._notification && this._notification.urgency == Urgency.CRITICAL) &&
-                                  !(this._notification && this._notification.focused) &&
-                                  !this._pointerInTray &&
-                                  !this._locked &&
-                                  !(this._pointerInKeyboard && notificationExpanded);
-        let notificationLockedOut = !Main.sessionMode.hasNotifications && this._notification;
-        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
-        let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
-
-        if (this._notificationState == State.HIDDEN) {
-            if (canShowNotification) {
-                this._showNotification();
-            }
-        } else if (this._notificationState == State.SHOWN) {
-            if (notificationMustClose)
-                this._hideNotification();
-            else if (notificationPinned && !notificationExpanded)
-                this._expandNotification(false);
-            else if (notificationPinned)
-                this._ensureNotificationFocused();
-        }
-
-        // Summary
-        let summarySummoned = this._pointerInSummary || this._overviewVisible ||  this._traySummoned;
-        let summaryPinned = this._pointerInTray || summarySummoned || this._locked;
-        let summaryHovered = this._pointerInTray || this._pointerInSummary;
-
-        let notificationsVisible = (this._notificationState == State.SHOWING ||
-                                    this._notificationState == State.SHOWN);
-        let notificationsDone = !notificationsVisible && !notificationsPending;
-
-        let summaryOptionalInOverview = this._overviewVisible && !this._locked && !summaryHovered;
-        let mustHideSummary = (notificationsPending && (notificationUrgent || summaryOptionalInOverview))
-                              || notificationsVisible || !Main.sessionMode.hasNotifications;
-
-        if (this._summaryState == State.HIDDEN && !mustHideSummary && summarySummoned)
-            this._showSummary();
-        else if (this._summaryState == State.SHOWN && (!summaryPinned || mustHideSummary))
-            this._hideSummary();
-
-        // Summary notification
-        let haveClickedSummaryItem = this._clickedSummaryItem != null;
-        let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification &&
-                                                     this._clickedSummaryItem.source == this._notification.source);
-        let canShowSummaryBoxPointer = this._summaryState == State.SHOWN;
-        // We only have sources with empty notification stacks for legacy tray icons. Currently, we never attempt
-        // to show notifications for legacy tray icons, but this would be necessary if we did.
-        let requestedNotificationStackIsEmpty = (this._clickedSummaryItemMouseButton == 1 && this._clickedSummaryItem.source.notifications.length == 0);
-        let wrongSummaryNotificationStack = (this._clickedSummaryItemMouseButton == 1 &&
-                                             this._summaryBoxPointer.bin.child != this._clickedSummaryItem.notificationStackWidget);
-        let wrongSummaryRightClickMenu = (this._clickedSummaryItemMouseButton == 3 &&
-                                          this._summaryBoxPointer.bin.child != this._clickedSummaryItem.rightClickMenu);
-        let wrongSummaryBoxPointer = (haveClickedSummaryItem &&
-                                      (wrongSummaryNotificationStack || wrongSummaryRightClickMenu));
-
-        if (this._summaryBoxPointerState == State.HIDDEN) {
-            if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
-                this._showSummaryBoxPointer();
-        } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideSummary) {
-                this._hideSummaryBoxPointer();
-                if (wrongSummaryBoxPointer)
-                    this._showSummaryBoxPointer();
-            }
-        }
-
-        // Tray itself
-        let trayIsVisible = (this._trayState == State.SHOWING ||
-                             this._trayState == State.SHOWN);
-        let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
-                                   this._summaryState == State.SHOWN);
-        if (!trayIsVisible && trayShouldBeVisible)
-            trayShouldBeVisible = this._showTray();
-        else if (trayIsVisible && !trayShouldBeVisible)
-            this._hideTray();
-
-        // Desktop clone
-        let desktopCloneIsVisible = (this._desktopCloneState == State.SHOWING ||
-                                     this._desktopCloneState == State.SHOWN);
-        let desktopCloneShouldBeVisible = (trayShouldBeVisible &&
-                                           !this._overviewVisible &&
-                                           !this._keyboardVisible);
-
-        if (!desktopCloneIsVisible && desktopCloneShouldBeVisible) {
-            this._showDesktopClone();
-        } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
-            this._hideDesktopClone (this._keyboardVisible);
-        }
-    },
-
-    _tween: function(actor, statevar, value, params) {
-        let onComplete = params.onComplete;
-        let onCompleteScope = params.onCompleteScope;
-        let onCompleteParams = params.onCompleteParams;
-
-        params.onComplete = this._tweenComplete;
-        params.onCompleteScope = this;
-        params.onCompleteParams = [statevar, value, onComplete, onCompleteScope, onCompleteParams];
-
-        // Remove other tweens that could mess with the state machine
-        Tweener.removeTweens(actor);
-        Tweener.addTween(actor, params);
-
-        let valuing = (value == State.SHOWN) ? State.SHOWING : State.HIDING;
-        this[statevar] = valuing;
-    },
-
-    _tweenComplete: function(statevar, value, onComplete, onCompleteScope, onCompleteParams) {
-        this[statevar] = value;
-        if (onComplete)
-            onComplete.apply(onCompleteScope, onCompleteParams);
-        this._updateState();
-    },
-
-    _showTray: function() {
-        // Don't actually take a modal grab in the overview.
-        // Just add something to the grab stack that we can
-        // pop later.
-        let modal = !this._overviewVisible;
-
-        if (!this._grabHelper.grab({ actor: this.actor,
-                                     modal: modal,
-                                     onUngrab: Lang.bind(this, this._escapeTray) })) {
-            this._traySummoned = false;
-            return false;
-        }
-
-        this._tween(this.actor, '_trayState', State.SHOWN,
-                    { y: -this.actor.height,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad'
-                    });
-
-        if (!this._overviewVisible)
-            this._lightbox.show();
-
-        return true;
-    },
-
-    _updateDesktopCloneClip: function() {
-        let geometry = this._bottomMonitorGeometry;
-        let progress = -Math.round(this._desktopClone.y);
-        this._desktopClone.set_clip(geometry.x,
-                                    geometry.y + progress,
-                                    geometry.width,
-                                    geometry.height - progress);
-    },
-
-    _showDesktopClone: function() {
-        let bottomMonitor = Main.layoutManager.bottomMonitor;
-        this._bottomMonitorGeometry = { x: bottomMonitor.x,
-                                        y: bottomMonitor.y,
-                                        width: bottomMonitor.width,
-                                        height: bottomMonitor.height };
-
-        if (this._desktopClone)
-            this._desktopClone.destroy();
-        this._desktopClone = new Clutter.Clone({ source: global.window_group, clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
-        Main.uiGroup.insert_child_above(this._desktopClone, global.window_group);
-        this._desktopClone.x = 0;
-        this._desktopClone.y = 0;
-        this._desktopClone.show();
-
-        this._tween(this._desktopClone, '_desktopCloneState', State.SHOWN,
-                    { y: -this.actor.height,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
-                    });
-    },
-
-    _hideTray: function() {
-        // Having the summary item animate out while sliding down the tray
-        // is distracting, so hide it immediately in case it was visible.
-        this._summaryBoxPointer.actor.hide();
-
-        this._tween(this.actor, '_trayState', State.HIDDEN,
-                    { y: 0,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad'
-                    });
-
-        // Note that we might have entered here without a grab,
-        // which would happen if GrabHelper ungrabbed for us.
-        // This is a no-op in that case.
-        this._grabHelper.ungrab({ actor: this.actor });
-        this._lightbox.hide();
-    },
-
-    _hideDesktopClone: function(now) {
-        this._tween(this._desktopClone, '_desktopCloneState', State.HIDDEN,
-                    { y: 0,
-                      time: now ? 0 : ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onComplete: Lang.bind(this, function() {
-                          this._desktopClone.destroy();
-                          this._desktopClone = null;
-                          this._bottomMonitorGeometry = null;
-                      }),
-                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
-                    });
-    },
-
-    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
-        this.idleMonitor.remove_watch(this._idleMonitorWatchId);
-        this._idleMonitorWatchId = 0;
-        if (!userBecameIdle)
-            this._updateNotificationTimeout(2000);
-        this._userActiveWhileNotificationShown = true;
-        this._updateState();
-    },
-
-    _showNotification: function() {
-        this._notification = this._notificationQueue.shift();
-        this._userActiveWhileNotificationShown = this.idleMonitor.get_idletime() <= IDLE_TIME;
-        this._idleMonitorWatchId = this.idleMonitor.add_watch(IDLE_TIME,
-                                                              Lang.bind(this, this._onIdleMonitorWatch));
-        this._notificationClickedId = this._notification.connect('done-displaying',
-                                                                 Lang.bind(this, this._escapeTray));
-        this._notification.connect('unfocused', Lang.bind(this, function() {
-            this._updateState();
-        }));
-        this._notificationBin.child = this._notification.actor;
-
-        this._notificationWidget.opacity = 0;
-        this._notificationWidget.y = 0;
-        this._notificationWidget.show();
-
-        this._updateShowingNotification();
-
-        let [x, y, mods] = global.get_pointer();
-        // We save the position of the mouse at the time when we started showing the notification
-        // in order to determine if the notification popped up under it. We make that check if
-        // the user starts moving the mouse and _onTrayHoverChanged() gets called. We don't
-        // expand the notification if it just happened to pop up under the mouse unless the user
-        // explicitly mouses away from it and then mouses back in.
-        this._showNotificationMouseX = x;
-        this._showNotificationMouseY = y;
-        // We save the coordinates of the mouse at the time when we started showing the notification
-        // and then we update it in _notificationTimeout(). We don't pop down the notification if
-        // the mouse is moving towards it or within it.
-        this._lastSeenMouseX = x;
-        this._lastSeenMouseY = y;
-    },
-
-    _updateShowingNotification: function() {
-        this._notification.acknowledged = true;
-
-        // We auto-expand notifications with CRITICAL urgency.
-        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 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 correct height.
-        //
-        // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
-        // notification is being shown.
-
-        let tweenParams = { opacity: 255,
-                            y: -this._notificationWidget.height,
-                            time: ANIMATION_TIME,
-                            transition: 'easeOutQuad',
-                            onComplete: this._showNotificationCompleted,
-                            onCompleteScope: this
-                          };
-
-        this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
-   },
-
-    _showNotificationCompleted: function() {
-        if (this._notification.urgency != Urgency.CRITICAL)
-            this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
-    },
-
-    _updateNotificationTimeout: function(timeout) {
-        if (this._notificationTimeoutId) {
-            Mainloop.source_remove(this._notificationTimeoutId);
-            this._notificationTimeoutId = 0;
-        }
-        if (timeout > 0)
-            this._notificationTimeoutId =
-                Mainloop.timeout_add(timeout,
-                                     Lang.bind(this, this._notificationTimeout));
-    },
-
-    _notificationTimeout: function() {
-        let [x, y, mods] = global.get_pointer();
-        if (y > this._lastSeenMouseY + 10 && !this.actor.hover) {
-            // The mouse is moving towards the notification, so don't
-            // hide it yet. (We just create a new timeout (and destroy
-            // the old one) each time because the bookkeeping is
-            // simpler.)
-            this._updateNotificationTimeout(1000);
-        } else if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId &&
-                  (x != this._lastSeenMouseX || y != this._lastSeenMouseY)) {
-            // Refresh the timeout if the notification originally
-            // popped up under the pointer, and the pointer is hovering
-            // inside it.
-            this._updateNotificationTimeout(1000);
-        } else {
-            this._notificationTimeoutId = 0;
-            this._updateState();
-        }
-
-        this._lastSeenMouseX = x;
-        this._lastSeenMouseY = y;
-        return false;
-    },
-
-    _hideNotification: function() {
-        this._grabHelper.ungrab({ actor: this._notification.actor });
-
-        if (this._notificationExpandedId) {
-            this._notification.disconnect(this._notificationExpandedId);
-            this._notificationExpandedId = 0;
-        }
-
-        if (this._notificationRemoved) {
-            this._notificationWidget.y = this.actor.height;
-            this._notificationWidget.opacity = 0;
-            this._notificationState = State.HIDDEN;
-            this._hideNotificationCompleted();
-        } else {
-            this._tween(this._notificationWidget, '_notificationState', State.HIDDEN,
-                        { y: this.actor.height,
-                          opacity: 0,
-                          time: ANIMATION_TIME,
-                          transition: 'easeOutQuad',
-                          onComplete: this._hideNotificationCompleted,
-                          onCompleteScope: this
-                        });
-
-        }
-    },
-
-    _hideNotificationCompleted: function() {
-        this._notificationRemoved = false;
-        this._notificationWidget.hide();
-        this._closeButton.hide();
-        this._pointerInTray = false;
-        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
-        this._notificationBin.child = null;
-        this._notification.collapseCompleted();
-        this._notification.disconnect(this._notificationClickedId);
-        this._notificationClickedId = 0;
-        let notification = this._notification;
-        this._notification = null;
-        if (notification.isTransient)
-            notification.destroy(NotificationDestroyedReason.EXPIRED);
-    },
-
-    _expandNotification: function(autoExpanding) {
-        // Don't grab focus in notifications that are auto-expanded.
-        if (!autoExpanding)
-            this._grabHelper.grab({ actor: this._notification.actor,
-                                    grabFocus: true });
-
-        if (!this._notificationExpandedId)
-            this._notificationExpandedId =
-                this._notification.connect('expanded',
-                                           Lang.bind(this, this._onNotificationExpanded));
-        // Don't animate changes in notifications that are auto-expanding.
-        this._notification.expand(!autoExpanding);
-    },
-
-    _onNotificationExpanded: function() {
-        let expandedY = - this._notificationWidget.height;
-        this._closeButton.show();
-
-        // Don't animate the notification to its new position if it has shrunk:
-        // there will be a very visible "gap" that breaks the illusion.
-        if (this._notificationWidget.y < expandedY) {
-            this._notificationWidget.y = expandedY;
-        } else if (this._notification.y != expandedY) {
-            // Tween also opacity here, to override a possible tween that's
-            // currently hiding the notification. This will ensure that the
-            // notification is not removed when the onComplete handler for this
-            // one triggers.
-            this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
-                        { y: expandedY,
-                          opacity: 255,
-                          time: ANIMATION_TIME,
-                          transition: 'easeOutQuad'
-                        });
-        }
-    },
-
-    // We use this function to grab focus when the user moves the pointer
-    // to a notification with CRITICAL urgency that was already auto-expanded.
-    _ensureNotificationFocused: function() {
-        this._grabHelper.grab({ actor: this._notification.actor,
-                                grabFocus: true });
-    },
-
-    _showSummary: function() {
-        this._summary.opacity = 0;
-        this._tween(this._summary, '_summaryState', State.SHOWN,
-                    { opacity: 255,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                    });
-    },
-
-    _hideSummary: function() {
-        this._tween(this._summary, '_summaryState', State.HIDDEN,
-                    { opacity: 0,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                    });
-    },
-
-    _showSummaryBoxPointer: function() {
-        this._summaryBoxPointerItem = this._clickedSummaryItem;
-        this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
-                                                                                      Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
-        this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
-                                                                                  Lang.bind(this, this._escapeTray));
-
-        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
-        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
-            let newQueue = [];
-            for (let i = 0; i < this._notificationQueue.length; i++) {
-                let notification = this._notificationQueue[i];
-                let sameSource = this._summaryBoxPointerItem.source == notification.source;
-                if (sameSource)
-                    notification.acknowledged = true;
-                else
-                    newQueue.push(notification);
-            }
-            this._notificationQueue = newQueue;
-
-            this._summaryBoxPointer.bin.child = this._summaryBoxPointerItem.notificationStackWidget;
-
-            let closeButton = this._summaryBoxPointerItem.closeButton;
-            closeButton.show();
-            this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer));
-            this._summaryBoxPointerItem.prepareNotificationStackForShowing();
-        } else if (this._clickedSummaryItemMouseButton == 3) {
-            this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu;
-        }
-
-        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-                                grabFocus: true,
-                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
-        this._lock();
-
-        this._summaryBoxPointer.actor.opacity = 0;
-        this._summaryBoxPointer.actor.show();
-        this._adjustSummaryBoxPointerPosition();
-
-        this._summaryBoxPointerState = State.SHOWING;
-        this._clickedSummaryItem.actor.add_style_pseudo_class('selected');
-        this._summaryBoxPointer.show(BoxPointer.PopupAnimation.FULL, Lang.bind(this, function() {
-            this._summaryBoxPointerState = State.SHOWN;
-        }));
-    },
-
-    _onSummaryBoxPointerContentUpdated: function() {
-        if (this._summaryBoxPointerItem.notificationStack.get_n_children() == 0)
-            this._hideSummaryBoxPointer();
-        this._adjustSummaryBoxPointerPosition();
-    },
-
-    _adjustSummaryBoxPointerPosition: function() {
-        if (!this._clickedSummaryItem)
-            return;
-
-        this._summaryBoxPointer.setPosition(this._clickedSummaryItem.actor, 0);
-    },
-
-    _setClickedSummaryItem: function(item, button) {
-        if (item == this._clickedSummaryItem &&
-            button == this._clickedSummaryItemMouseButton)
-            return false;
-
-        if (this._clickedSummaryItem) {
-            this._clickedSummaryItem.actor.remove_style_pseudo_class('selected');
-            this._clickedSummaryItem.actor.disconnect(this._clickedSummaryItemAllocationChangedId);
-            this._summary.disconnect(this._summaryMotionId);
-            Main.layoutManager.trayBox.disconnect(this._trayMotionId);
-            this._clickedSummaryItemAllocationChangedId = 0;
-            this._summaryMotionId = 0;
-            this._trayMotionId = 0;
-        }
-
-        this._clickedSummaryItem = item;
-        this._clickedSummaryItemMouseButton = button;
-
-        if (this._clickedSummaryItem) {
-            this._clickedSummaryItem.source.emit('summary-item-clicked', button);
-            this._clickedSummaryItem.actor.add_style_pseudo_class('selected');
-            this._clickedSummaryItemAllocationChangedId =
-                this._clickedSummaryItem.actor.connect('allocation-changed',
-                                                       Lang.bind(this, this._adjustSummaryBoxPointerPosition));
-            // _clickedSummaryItem.actor can change absolute position without changing allocation
-            this._summaryMotionId = this._summary.connect('allocation-changed',
-                                                          Lang.bind(this, this._adjustSummaryBoxPointerPosition));
-            this._trayMotionId = Main.layoutManager.trayBox.connect('notify::anchor-y',
-                                                                    Lang.bind(this, this._adjustSummaryBoxPointerPosition));
-        }
-
-        return true;
-    },
-
-   _onSummaryBoxPointerKeyPress: function(actor, event) {
-       switch (event.get_key_symbol()) {
-           case Clutter.KEY_Down:
-           case Clutter.KEY_Escape:
-               this._setClickedSummaryItem(null);
-               this._updateState();
-               return true;
-           case Clutter.KEY_Delete:
-               this._clickedSummaryItem.source.destroy();
-               this._escapeTray();
-               return true;
-       }
-       return false;
-   },
-
-    _onSummaryBoxPointerUngrabbed: function() {
-        this._summaryBoxPointerState = State.HIDING;
-        this._unlock();
-
-        if (this._summaryBoxPointerItem.source.notifications.length == 0) {
-            this._summaryBoxPointer.actor.hide();
-            this._hideSummaryBoxPointerCompleted();
-        } else {
-            if (global.stage.key_focus &&
-                !this.actor.contains(global.stage.key_focus))
-                this._setClickedSummaryItem(null);
-            this._summaryBoxPointer.hide(BoxPointer.PopupAnimation.FULL, Lang.bind(this, this._hideSummaryBoxPointerCompleted));
-        }
-    },
-
-    _hideSummaryBoxPointer: function() {
-        this._grabHelper.ungrab({ actor: this._summaryBoxPointer.bin.child });
-    },
-
-    _hideSummaryBoxPointerCompleted: function() {
-        let doneShowingNotificationStack = (this._summaryBoxPointer.bin.child == this._summaryBoxPointerItem.notificationStackWidget);
-
-        this._summaryBoxPointerState = State.HIDDEN;
-        this._summaryBoxPointer.bin.child = null;
-        this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId);
-        this._summaryBoxPointerContentUpdatedId = 0;
-        this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId);
-        this._summaryBoxPointerCloseClickedId = 0;
-        this._summaryBoxPointerItem.source.disconnect(this._sourceDoneDisplayingId);
-        this._summaryBoxPointerDoneDisplayingId = 0;
-
-        let sourceNotificationStackDoneShowing = null;
-        if (doneShowingNotificationStack) {
-            this._summaryBoxPointerItem.doneShowingNotificationStack();
-            sourceNotificationStackDoneShowing = this._summaryBoxPointerItem.source;
-        }
-
-        this._summaryBoxPointerItem = null;
-
-        if (sourceNotificationStackDoneShowing) {
-            if (sourceNotificationStackDoneShowing.isTransient && !this._reNotifyAfterHideNotification)
-                sourceNotificationStackDoneShowing.destroy(NotificationDestroyedReason.EXPIRED);
-            if (this._reNotifyAfterHideNotification) {
-                this._onNotify(this._reNotifyAfterHideNotification.source, this._reNotifyAfterHideNotification);
-                this._reNotifyAfterHideNotification = null;
-            }
-        }
-
-        if (this._clickedSummaryItem)
-            this._updateState();
-    }
-});
-Signals.addSignalMethods(MessageTray.prototype);
-
-const SystemNotificationSource = new Lang.Class({
-    Name: 'SystemNotificationSource',
-    Extends: Source,
-
-    _init: function() {
-        this.parent(_("System Information"), 'dialog-information-symbolic');
-        this.setTransient(true);
-    },
-
-    open: function() {
-        this.destroy();
-    }
-});

=== removed directory '.pc/git_messagetray_opacity_fix.patch'
=== removed directory '.pc/git_messagetray_opacity_fix.patch/js'
=== removed directory '.pc/git_messagetray_opacity_fix.patch/js/ui'
=== removed file '.pc/git_messagetray_opacity_fix.patch/js/ui/messageTray.js'
--- .pc/git_messagetray_opacity_fix.patch/js/ui/messageTray.js	2012-11-27 08:27:57 +0000
+++ .pc/git_messagetray_opacity_fix.patch/js/ui/messageTray.js	1970-01-01 00:00:00 +0000
@@ -1,2550 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Atk = imports.gi.Atk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const BoxPointer = imports.ui.boxpointer;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const GnomeSession = imports.misc.gnomeSession;
-const GrabHelper = imports.ui.grabHelper;
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const PointerWatcher = imports.ui.pointerWatcher;
-const PopupMenu = imports.ui.popupMenu;
-const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;
-
-const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
-
-const ANIMATION_TIME = 0.2;
-const NOTIFICATION_TIMEOUT = 4;
-const SUMMARY_TIMEOUT = 1;
-const LONGER_SUMMARY_TIMEOUT = 4;
-
-const HIDE_TIMEOUT = 0.2;
-const LONGER_HIDE_TIMEOUT = 0.6;
-
-const NOTIFICATION_ICON_SIZE = 24;
-
-// We delay hiding of the tray if the mouse is within MOUSE_LEFT_ACTOR_THRESHOLD
-// range from the point where it left the tray.
-const MOUSE_LEFT_ACTOR_THRESHOLD = 20;
-
-// Time the user needs to leave the mouse on the bottom pixel row to open the tray
-const TRAY_DWELL_TIME = 1000; // ms
-// Time resolution when tracking the mouse to catch the open tray dwell
-const TRAY_DWELL_CHECK_INTERVAL = 100; // ms
-
-const IDLE_TIME = 1000;
-
-const State = {
-    HIDDEN:  0,
-    SHOWING: 1,
-    SHOWN:   2,
-    HIDING:  3
-};
-
-// These reasons are useful when we destroy the notifications received through
-// the notification daemon. We use EXPIRED for transient notifications that the
-// user did not interact with, DISMISSED for all other notifications that were
-// destroyed as a result of a user action, and SOURCE_CLOSED for the notifications
-// that were requested to be destroyed by the associated source.
-const NotificationDestroyedReason = {
-    EXPIRED: 1,
-    DISMISSED: 2,
-    SOURCE_CLOSED: 3
-};
-
-// Message tray has its custom Urgency enumeration. LOW, NORMAL and CRITICAL
-// urgency values map to the corresponding values for the notifications received
-// through the notification daemon. HIGH urgency value is used for chats received
-// through the Telepathy client.
-const Urgency = {
-    LOW: 0,
-    NORMAL: 1,
-    HIGH: 2,
-    CRITICAL: 3
-}
-
-function _fixMarkup(text, allowMarkup) {
-    if (allowMarkup) {
-        // Support &amp;, &quot;, &apos;, &lt; and &gt;, escape all other
-        // occurrences of '&'.
-        let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&amp;');
-
-        // Support <b>, <i>, and <u>, escape anything else
-        // so it displays as raw markup.
-        _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
-
-        try {
-            Pango.parse_markup(_text, -1, '');
-            return _text;
-        } catch (e) {}
-    }
-
-    // !allowMarkup, or invalid markup
-    return GLib.markup_escape_text(text, -1);
-}
-
-const URLHighlighter = new Lang.Class({
-    Name: 'URLHighlighter',
-
-    _init: function(text, lineWrap, allowMarkup) {
-        if (!text)
-            text = '';
-        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
-        this._linkColor = '#ccccff';
-        this.actor.connect('style-changed', Lang.bind(this, function() {
-            let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
-            if (hasColor) {
-                let linkColor = color.to_string().substr(0, 7);
-                if (linkColor != this._linkColor) {
-                    this._linkColor = linkColor;
-                    this._highlightUrls();
-                }
-            }
-        }));
-        if (lineWrap) {
-            this.actor.clutter_text.line_wrap = true;
-            this.actor.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this.actor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        }
-
-        this.setMarkup(text, allowMarkup);
-        this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
-            // Don't try to URL highlight when invisible.
-            // The MessageTray doesn't actually hide us, so
-            // we need to check for paint opacities as well.
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            // Keep Notification.actor from seeing this and taking
-            // a pointer grab, which would block our button-release-event
-            // handler, if an URL is clicked
-            return this._findUrlAtPos(event) != -1;
-        }));
-        this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1) {
-                let url = this._urls[urlId].url;
-                if (url.indexOf(':') == -1)
-                    url = 'http://' + url;
-                try {
-                    Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-                    return true;
-                } catch (e) {
-                    // TODO: remove this after gnome 3 release
-                    Util.spawn(['gvfs-open', url]);
-                    return true;
-                }
-            }
-            return false;
-        }));
-        this.actor.connect('motion-event', Lang.bind(this, function(actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return false;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1 && !this._cursorChanged) {
-                global.set_cursor(Shell.Cursor.POINTING_HAND);
-                this._cursorChanged = true;
-            } else if (urlId == -1) {
-                global.unset_cursor();
-                this._cursorChanged = false;
-            }
-            return false;
-        }));
-        this.actor.connect('leave-event', Lang.bind(this, function() {
-            if (!this.actor.visible || this.actor.get_paint_opacity() == 0)
-                return;
-
-            if (this._cursorChanged) {
-                this._cursorChanged = false;
-                global.unset_cursor();
-            }
-        }));
-    },
-
-    setMarkup: function(text, allowMarkup) {
-        text = text ? _fixMarkup(text, allowMarkup) : '';
-        this._text = text;
-
-        this.actor.clutter_text.set_markup(text);
-        /* clutter_text.text contain text without markup */
-        this._urls = Util.findUrls(this.actor.clutter_text.text);
-        this._highlightUrls();
-    },
-
-    _highlightUrls: function() {
-        // text here contain markup
-        let urls = Util.findUrls(this._text);
-        let markup = '';
-        let pos = 0;
-        for (let i = 0; i < urls.length; i++) {
-            let url = urls[i];
-            let str = this._text.substr(pos, url.pos - pos);
-            markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
-            pos = url.pos + url.url.length;
-        }
-        markup += this._text.substr(pos);
-        this.actor.clutter_text.set_markup(markup);
-    },
-
-    _findUrlAtPos: function(event) {
-        let success;
-        let [x, y] = event.get_coords();
-        [success, x, y] = this.actor.transform_stage_point(x, y);
-        let find_pos = -1;
-        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
-            if (py > y || py + line_height < y || x < px)
-                continue;
-            find_pos = i;
-        }
-        if (find_pos != -1) {
-            for (let i = 0; i < this._urls.length; i++)
-            if (find_pos >= this._urls[i].pos &&
-                this._urls[i].pos + this._urls[i].url.length > find_pos)
-                return i;
-        }
-        return -1;
-    }
-});
-
-function makeCloseButton() {
-    let closeButton = new St.Button({ style_class: 'notification-close'});
-
-    // This is a bit tricky. St.Bin has its own x-align/y-align properties
-    // that compete with Clutter's properties. This should be fixed for
-    // Clutter 2.0. Since St.Bin doesn't define its own setters, the
-    // setters are a workaround to get Clutter's version.
-    closeButton.set_x_align(Clutter.ActorAlign.END);
-    closeButton.set_y_align(Clutter.ActorAlign.START);
-
-    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-    // to respect the alignments.
-    closeButton.set_x_expand(true);
-    closeButton.set_y_expand(true);
-
-    closeButton.connect('style-changed', function() {
-        let themeNode = closeButton.get_theme_node();
-
-        // libcroco doesn't support negative units
-        let direction = closeButton.get_text_direction() == Clutter.TextDirection.RTL ? -1 : 1;
-        closeButton.translation_x = direction * themeNode.get_length('-shell-close-overlap-x');
-
-        // libcroco doesn't support negative units
-        closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
-    });
-
-    return closeButton;
-}
-
-// Notification:
-// @source: the notification's Source
-// @title: the title
-// @banner: the banner text
-// @params: optional additional params
-//
-// Creates a notification. In the banner mode, the notification
-// will show an icon, @title (in bold) and @banner, all on a single
-// line (with @banner ellipsized if necessary).
-//
-// The notification will be expandable if either it has additional
-// elements that were added to it or if the @banner text did not
-// fit fully in the banner mode. When the notification is expanded,
-// the @banner text from the top line is always removed. The complete
-// @banner text is added as the first element in the content section,
-// unless 'customContent' parameter with the value 'true' is specified
-// in @params.
-//
-// Additional notification content can be added with addActor() and
-// addBody() methods. The notification content is put inside a
-// scrollview, so if it gets too tall, the notification will scroll
-// rather than continue to grow. In addition to this main content
-// area, there is also a single-row action area, which is not
-// scrolled and can contain a single actor. The action area can
-// be set by calling setActionArea() method. There is also a
-// convenience method addButton() for adding a button to the action
-// area.
-//
-// @params can contain values for 'customContent', 'body', 'icon',
-// 'titleMarkup', 'bannerMarkup', 'bodyMarkup', and 'clear'
-// parameters.
-//
-// If @params contains a 'customContent' parameter with the value %true,
-// then @banner will not be shown in the body of the notification when the
-// notification is expanded and calls to update() will not clear the content
-// unless 'clear' parameter with value %true is explicitly specified.
-//
-// If @params contains a 'body' parameter, then that text will be added to
-// the content area (as with addBody()).
-//
-// By default, the icon shown is created by calling
-// source.createIcon(). However, if @params contains an 'icon'
-// parameter, the passed in icon will be used.
-//
-// If @params contains a 'titleMarkup', 'bannerMarkup', or
-// 'bodyMarkup' parameter with the value %true, then the corresponding
-// element is assumed to use pango markup. If the parameter is not
-// present for an element, then anything that looks like markup in
-// that element will appear literally in the output.
-//
-// If @params contains a 'clear' parameter with the value %true, then
-// the content and the action area of the notification will be cleared.
-// The content area is also always cleared if 'customContent' is false
-// because it might contain the @banner that didn't fit in the banner mode.
-const Notification = new Lang.Class({
-    Name: 'Notification',
-
-    IMAGE_SIZE: 125,
-
-    _init: function(source, title, banner, params) {
-        this.source = source;
-        this.title = title;
-        this.urgency = Urgency.NORMAL;
-        this.resident = false;
-        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
-        this.isTransient = false;
-        this.expanded = false;
-        this.focused = false;
-        this.acknowledged = false;
-        this._destroyed = false;
-        this._useActionIcons = false;
-        this._customContent = false;
-        this._bannerBodyText = null;
-        this._bannerBodyMarkup = false;
-        this._titleFitsInBannerMode = true;
-        this._titleDirection = Clutter.TextDirection.DEFAULT;
-        this._spacing = 0;
-        this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
-        this._imageBin = null;
-
-        source.connect('destroy', Lang.bind(this,
-            function (source, reason) {
-                this.destroy(reason);
-            }));
-
-        this.actor = new St.Button({ accessible_role: Atk.Role.NOTIFICATION });
-        this.actor.add_style_class_name('notification-unexpanded');
-        this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._table = new St.Table({ style_class: 'notification',
-                                     reactive: true });
-        this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
-        this.actor.set_child(this._table);
-
-        // The first line should have the title, followed by the
-        // banner text, but ellipsized if they won't both fit. We can't
-        // make St.Table or St.BoxLayout do this the way we want (don't
-        // show banner at all if title needs to be ellipsized), so we
-        // use Shell.GenericContainer.
-        this._bannerBox = new Shell.GenericContainer();
-        this._bannerBox.connect('get-preferred-width', Lang.bind(this, this._bannerBoxGetPreferredWidth));
-        this._bannerBox.connect('get-preferred-height', Lang.bind(this, this._bannerBoxGetPreferredHeight));
-        this._bannerBox.connect('allocate', Lang.bind(this, this._bannerBoxAllocate));
-        this._table.add(this._bannerBox, { row: 0,
-                                           col: 1,
-                                           col_span: 2,
-                                           x_expand: false,
-                                           y_expand: false,
-                                           y_fill: false });
-
-        // This is an empty cell that overlaps with this._bannerBox cell to ensure
-        // that this._bannerBox cell expands horizontally, while not forcing the
-        // this._imageBin that is also in col: 2 to expand horizontally.
-        this._table.add(new St.Bin(), { row: 0,
-                                        col: 2,
-                                        y_expand: false,
-                                        y_fill: false });
-
-        this._titleLabel = new St.Label();
-        this._bannerBox.add_actor(this._titleLabel);
-        this._bannerUrlHighlighter = new URLHighlighter();
-        this._bannerLabel = this._bannerUrlHighlighter.actor;
-        this._bannerBox.add_actor(this._bannerLabel);
-
-        this.update(title, banner, params);
-    },
-
-    // update:
-    // @title: the new title
-    // @banner: the new banner
-    // @params: as in the Notification constructor
-    //
-    // Updates the notification by regenerating its icon and updating
-    // the title/banner. If @params.clear is %true, it will also
-    // remove any additional actors/action buttons previously added.
-    update: function(title, banner, params) {
-        params = Params.parse(params, { customContent: false,
-                                        body: null,
-                                        icon: null,
-                                        secondaryIcon: null,
-                                        titleMarkup: false,
-                                        bannerMarkup: false,
-                                        bodyMarkup: false,
-                                        clear: false });
-
-        this._customContent = params.customContent;
-
-        let oldFocus = global.stage.key_focus;
-
-        if (this._icon && (params.icon || params.clear)) {
-            this._icon.destroy();
-            this._icon = null;
-        }
-
-        if (this._secondaryIcon && (params.secondaryIcon || params.clear)) {
-            this._secondaryIcon.destroy();
-            this._secondaryIcon = null;
-        }
-
-        // We always clear the content area if we don't have custom
-        // content because it might contain the @banner that didn't
-        // fit in the banner mode.
-        if (this._scrollArea && (!this._customContent || params.clear)) {
-            if (oldFocus && this._scrollArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._scrollArea.destroy();
-            this._scrollArea = null;
-            this._contentArea = null;
-        }
-        if (this._actionArea && params.clear) {
-            if (oldFocus && this._actionArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._actionArea.destroy();
-            this._actionArea = null;
-            this._buttonBox = null;
-        }
-        if (this._imageBin && params.clear)
-            this.unsetImage();
-
-        if (!this._scrollArea && !this._actionArea && !this._imageBin)
-            this._table.remove_style_class_name('multi-line-notification');
-
-        if (!this._icon) {
-            this._icon = params.icon || this.source.createIcon(NOTIFICATION_ICON_SIZE);
-            this._table.add(this._icon, { row: 0,
-                                          col: 0,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          y_fill: false,
-                                          y_align: St.Align.START });
-        }
-
-        if (!this._secondaryIcon) {
-            this._secondaryIcon = params.secondaryIcon;
-
-            if (this._secondaryIcon)
-                this._bannerBox.add_actor(this._secondaryIcon);
-        }
-
-        this.title = title;
-        title = title ? _fixMarkup(title.replace(/\n/g, ' '), params.titleMarkup) : '';
-        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
-
-        if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
-            this._titleDirection = Clutter.TextDirection.RTL;
-        else
-            this._titleDirection = Clutter.TextDirection.LTR;
-
-        // Let the title's text direction control the overall direction
-        // of the notification - in case where different scripts are used
-        // in the notification, this is the right thing for the icon, and
-        // arguably for action buttons as well. Labels other than the title
-        // will be allocated at the available width, so that their alignment
-        // is done correctly automatically.
-        this._table.set_text_direction(this._titleDirection);
-
-        // Unless the notification has custom content, we save this._bannerBodyText
-        // to add it to the content of the notification if the notification is
-        // expandable due to other elements in its content area or due to the banner
-        // not fitting fully in the single-line mode.
-        this._bannerBodyText = this._customContent ? null : banner;
-        this._bannerBodyMarkup = params.bannerMarkup;
-
-        banner = banner ? banner.replace(/\n/g, '  ') : '';
-
-        this._bannerUrlHighlighter.setMarkup(banner, params.bannerMarkup);
-        this._bannerLabel.queue_relayout();
-
-        // Add the bannerBody now if we know for sure we'll need it
-        if (this._bannerBodyText && this._bannerBodyText.indexOf('\n') > -1)
-            this._addBannerBody();
-
-        if (params.body)
-            this.addBody(params.body, params.bodyMarkup);
-        this.updated();
-    },
-
-    setIconVisible: function(visible) {
-        this._icon.visible = visible;
-    },
-
-    enableScrolling: function(enableScrolling) {
-        this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea) {
-            this._scrollArea.vscrollbar_policy = this._scrollPolicy;
-            this._scrollArea.enable_mouse_scrolling = enableScrolling;
-        }
-    },
-
-    _createScrollArea: function() {
-        this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
-                                               vscrollbar_policy: this._scrollPolicy,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
-        this._table.add(this._scrollArea, { row: 1,
-                                            col: 2 });
-        this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
-                                               vertical: true });
-        this._scrollArea.add_actor(this._contentArea);
-        // If we know the notification will be expandable, we need to add
-        // the banner text to the body as the first element.
-        this._addBannerBody();
-    },
-
-    // addActor:
-    // @actor: actor to add to the body of the notification
-    //
-    // Appends @actor to the notification's body
-    addActor: function(actor, style) {
-        if (!this._scrollArea) {
-            this._createScrollArea();
-        }
-
-        this._contentArea.add(actor, style ? style : {});
-        this.updated();
-    },
-
-    // addBody:
-    // @text: the text
-    // @markup: %true if @text contains pango markup
-    // @style: style to use when adding the actor containing the text
-    //
-    // Adds a multi-line label containing @text to the notification.
-    //
-    // Return value: the newly-added label
-    addBody: function(text, markup, style) {
-        let label = new URLHighlighter(text, true, markup);
-
-        this.addActor(label.actor, style);
-        return label.actor;
-    },
-
-    _addBannerBody: function() {
-        if (this._bannerBodyText) {
-            let text = this._bannerBodyText;
-            this._bannerBodyText = null;
-            this.addBody(text, this._bannerBodyMarkup);
-        }
-    },
-
-    // scrollTo:
-    // @side: St.Side.TOP or St.Side.BOTTOM
-    //
-    // Scrolls the content area (if scrollable) to the indicated edge
-    scrollTo: function(side) {
-        let adjustment = this._scrollArea.vscroll.adjustment;
-        if (side == St.Side.TOP)
-            adjustment.value = adjustment.lower;
-        else if (side == St.Side.BOTTOM)
-            adjustment.value = adjustment.upper;
-    },
-
-    // setActionArea:
-    // @actor: the actor
-    // @props: (option) St.Table child properties
-    //
-    // Puts @actor into the action area of the notification, replacing
-    // the previous contents
-    setActionArea: function(actor, props) {
-        if (this._actionArea) {
-            this._actionArea.destroy();
-            this._actionArea = null;
-            if (this._buttonBox)
-                this._buttonBox = null;
-        } else {
-            this._addBannerBody();
-        }
-        this._actionArea = actor;
-
-        if (!props)
-            props = {};
-        props.row = 2;
-        props.col = 2;
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add(this._actionArea, props);
-        this._updateLastColumnSettings();
-        this.updated();
-    },
-
-    _updateLastColumnSettings: function() {
-        if (this._scrollArea)
-            this._table.child_set(this._scrollArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
-        if (this._actionArea)
-            this._table.child_set(this._actionArea, { col: this._imageBin ? 2 : 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
-    },
-
-    setImage: function(image) {
-        if (this._imageBin)
-            this.unsetImage();
-        this._imageBin = new St.Bin();
-        this._imageBin.child = image;
-        this._imageBin.opacity = 230;
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add_style_class_name('notification-with-image');
-        this._addBannerBody();
-        this._updateLastColumnSettings();
-        this._table.add(this._imageBin, { row: 1,
-                                          col: 1,
-                                          row_span: 2,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          x_fill: false,
-                                          y_fill: false });
-    },
-
-    unsetImage: function() {
-        if (this._imageBin) {
-            this._table.remove_style_class_name('notification-with-image');
-            this._table.remove_actor(this._imageBin);
-            this._imageBin = null;
-            this._updateLastColumnSettings();
-            if (!this._scrollArea && !this._actionArea)
-                this._table.remove_style_class_name('multi-line-notification');
-        }
-    },
-
-    // addButton:
-    // @id: the action ID
-    // @label: the label for the action's button
-    //
-    // Adds a button with the given @label to the notification. All
-    // action buttons will appear in a single row at the bottom of
-    // the notification.
-    //
-    // If the button is clicked, the notification will emit the
-    // %action-invoked signal with @id as a parameter
-    addButton: function(id, label) {
-        if (!this._buttonBox) {
-
-            let box = new St.BoxLayout({ style_class: 'notification-actions' });
-            this.setActionArea(box, { x_expand: false,
-                                      y_expand: false,
-                                      x_fill: false,
-                                      y_fill: false,
-                                      x_align: St.Align.END });
-            this._buttonBox = box;
-        }
-
-        let button = new St.Button({ can_focus: true });
-        button._actionId = id;
-
-        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
-            button.add_style_class_name('notification-icon-button');
-            button.child = new St.Icon({ icon_name: id });
-        } else {
-            button.add_style_class_name('notification-button');
-            button.label = label;
-        }
-
-        if (this._buttonBox.get_n_children() > 0)
-            global.focus_manager.remove_group(this._buttonBox);
-
-        this._buttonBox.add(button);
-        global.focus_manager.add_group(this._buttonBox);
-        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
-
-        this.updated();
-    },
-
-    // setButtonSensitive:
-    // @id: the action ID
-    // @sensitive: whether the button should be sensitive
-    //
-    // If the notification contains a button with action ID @id,
-    // its sensitivity will be set to @sensitive. Insensitive
-    // buttons cannot be clicked.
-    setButtonSensitive: function(id, sensitive) {
-        if (!this._buttonBox)
-            return;
-
-        let button = this._buttonBox.get_children().filter(function(b) {
-            return b._actionId == id;
-        })[0];
-
-        if (!button || button.reactive == sensitive)
-            return;
-
-        button.reactive = sensitive;
-    },
-
-    setUrgency: function(urgency) {
-        this.urgency = urgency;
-    },
-
-    setResident: function(resident) {
-        this.resident = resident;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
-    },
-
-    setUseActionIcons: function(useIcons) {
-        this._useActionIcons = useIcons;
-    },
-
-    _styleChanged: function() {
-        this._spacing = this._table.get_theme_node().get_length('spacing-columns');
-    },
-
-    _bannerBoxGetPreferredWidth: function(actor, forHeight, alloc) {
-        let [titleMin, titleNat] = this._titleLabel.get_preferred_width(forHeight);
-        let [bannerMin, bannerNat] = this._bannerLabel.get_preferred_width(forHeight);
-
-        if (this._secondaryIcon) {
-            let [secondaryIconMin, secondaryIconNat] = this._secondaryIcon.get_preferred_width(forHeight);
-
-            alloc.min_size = secondaryIconMin + this._spacing + titleMin;
-            alloc.natural_size = secondaryIconNat + this._spacing + titleNat + this._spacing + bannerNat;
-        } else {
-            alloc.min_size = titleMin;
-            alloc.natural_size = titleNat + this._spacing + bannerNat;
-        }
-    },
-
-    _bannerBoxGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] =
-            this._titleLabel.get_preferred_height(forWidth);
-    },
-
-    _bannerBoxAllocate: function(actor, box, flags) {
-        let availWidth = box.x2 - box.x1;
-
-        let [titleMinW, titleNatW] = this._titleLabel.get_preferred_width(-1);
-        let [titleMinH, titleNatH] = this._titleLabel.get_preferred_height(availWidth);
-        let [bannerMinW, bannerNatW] = this._bannerLabel.get_preferred_width(availWidth);
-
-        let rtl = (this._titleDirection == Clutter.TextDirection.RTL);
-        let x = rtl ? availWidth : 0;
-
-        if (this._secondaryIcon) {
-            let [iconMinW, iconNatW] = this._secondaryIcon.get_preferred_width(-1);
-            let [iconMinH, iconNatH] = this._secondaryIcon.get_preferred_height(availWidth);
-
-            let secondaryIconBox = new Clutter.ActorBox();
-            let secondaryIconBoxW = Math.min(iconNatW, availWidth);
-
-            // allocate secondary icon box
-            if (rtl) {
-                secondaryIconBox.x1 = x - secondaryIconBoxW;
-                secondaryIconBox.x2 = x;
-                x = x - (secondaryIconBoxW + this._spacing);
-            } else {
-                secondaryIconBox.x1 = x;
-                secondaryIconBox.x2 = x + secondaryIconBoxW;
-                x = x + secondaryIconBoxW + this._spacing;
-            }
-            secondaryIconBox.y1 = 0;
-            // Using titleNatH ensures that the secondary icon is centered vertically
-            secondaryIconBox.y2 = titleNatH;
-
-            availWidth = availWidth - (secondaryIconBoxW + this._spacing);
-            this._secondaryIcon.allocate(secondaryIconBox, flags);
-        }
-
-        let titleBox = new Clutter.ActorBox();
-        let titleBoxW = Math.min(titleNatW, availWidth);
-        if (rtl) {
-            titleBox.x1 = availWidth - titleBoxW;
-            titleBox.x2 = availWidth;
-        } else {
-            titleBox.x1 = x;
-            titleBox.x2 = titleBox.x1 + titleBoxW;
-        }
-        titleBox.y1 = 0;
-        titleBox.y2 = titleNatH;
-        this._titleLabel.allocate(titleBox, flags);
-        this._titleFitsInBannerMode = (titleNatW <= availWidth);
-
-        let bannerFits = true;
-        if (titleBoxW + this._spacing > availWidth) {
-            this._bannerLabel.opacity = 0;
-            bannerFits = false;
-        } else {
-            let bannerBox = new Clutter.ActorBox();
-
-            if (rtl) {
-                bannerBox.x1 = 0;
-                bannerBox.x2 = titleBox.x1 - this._spacing;
-
-                bannerFits = (bannerBox.x2 - bannerNatW >= 0);
-            } else {
-                bannerBox.x1 = titleBox.x2 + this._spacing;
-                bannerBox.x2 = availWidth;
-
-                bannerFits = (bannerBox.x1 + bannerNatW <= availWidth);
-            }
-            bannerBox.y1 = 0;
-            bannerBox.y2 = titleNatH;
-            this._bannerLabel.allocate(bannerBox, flags);
-
-            // Make _bannerLabel visible if the entire notification
-            // fits on one line, or if the notification is currently
-            // unexpanded and only showing one line anyway.
-            if (!this.expanded || (bannerFits && this._table.row_count == 1))
-                this._bannerLabel.opacity = 255;
-        }
-
-        // If the banner doesn't fully fit in the banner box, we possibly need to add the
-        // banner to the body. We can't do that from here though since that will force a
-        // relayout, so we add it to the main loop.
-        if (!bannerFits && this._canExpandContent())
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                           Lang.bind(this,
-                                     function() {
-                                        if (this._canExpandContent()) {
-                                            this._addBannerBody();
-                                            this._table.add_style_class_name('multi-line-notification');
-                                            this.updated();
-                                        }
-                                        return false;
-                                     }));
-    },
-
-    _canExpandContent: function() {
-        return this._bannerBodyText ||
-               (!this._titleFitsInBannerMode && !this._table.has_style_class_name('multi-line-notification'));
-    },
-
-    updated: function() {
-        if (this.expanded)
-            this.expand(false);
-    },
-
-    expand: function(animate) {
-        this.expanded = true;
-        this.actor.remove_style_class_name('notification-unexpanded');
-
-        // The banner is never shown when the title did not fit, so this
-        // can be an if-else statement.
-        if (!this._titleFitsInBannerMode) {
-            // Remove ellipsization from the title label and make it wrap so that
-            // we show the full title when the notification is expanded.
-            this._titleLabel.clutter_text.line_wrap = true;
-            this._titleLabel.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        } else if (this._table.row_count > 1 && this._bannerLabel.opacity != 0) {
-            // We always hide the banner if the notification has additional content.
-            //
-            // We don't need to wrap the banner that doesn't fit the way we wrap the
-            // title that doesn't fit because we won't have a notification with
-            // row_count=1 that has a banner that doesn't fully fit. We'll either add
-            // that banner to the content of the notification in _bannerBoxAllocate()
-            // or the notification will have custom content.
-            if (animate)
-                Tweener.addTween(this._bannerLabel,
-                                 { opacity: 0,
-                                   time: ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._bannerLabel.opacity = 0;
-        }
-        this.emit('expanded');
-    },
-
-    collapseCompleted: function() {
-        if (this._destroyed)
-            return;
-        this.expanded = false;
-        // Make sure we don't line wrap the title, and ellipsize it instead.
-        this._titleLabel.clutter_text.line_wrap = false;
-        this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-        // Restore banner opacity in case the notification is shown in the
-        // banner mode again on update.
-        this._bannerLabel.opacity = 255;
-        // Restore height requisition
-        this.actor.add_style_class_name('notification-unexpanded');
-        this.emit('collapsed');
-    },
-
-    _onActionInvoked: function(actor, mouseButtonClicked, id) {
-        this.emit('action-invoked', id);
-        if (!this.resident) {
-            // We don't hide a resident notification when the user invokes one of its actions,
-            // because it is common for such notifications to update themselves with new
-            // information based on the action. We'd like to display the updated information
-            // in place, rather than pop-up a new notification.
-            this.emit('done-displaying');
-            this.destroy();
-        }
-    },
-
-    _onClicked: function() {
-        this.emit('clicked');
-        // We hide all types of notifications once the user clicks on them because the common
-        // outcome of clicking should be the relevant window being brought forward and the user's
-        // attention switching to the window.
-        this.emit('done-displaying');
-        if (!this.resident)
-            this.destroy();
-    },
-
-    _onDestroy: function() {
-        if (this._destroyed)
-            return;
-        this._destroyed = true;
-        if (!this._destroyedReason)
-            this._destroyedReason = NotificationDestroyedReason.DISMISSED;
-        this.emit('destroy', this._destroyedReason);
-    },
-
-    destroy: function(reason) {
-        this._destroyedReason = reason;
-        this.actor.destroy();
-        this.actor._delegate = null;
-    }
-});
-Signals.addSignalMethods(Notification.prototype);
-
-const SourceActor = new Lang.Class({
-    Name: 'SourceActor',
-
-    _init: function(source, size) {
-        this._source = source;
-        this._size = size;
-
-        this.actor = new Shell.GenericContainer();
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.connect('destroy', Lang.bind(this, function() {
-            this._actorDestroyed = true;
-        }));
-        this._actorDestroyed = false;
-
-        this._counterLabel = new St.Label( {x_align: Clutter.ActorAlign.CENTER,
-                                            x_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER,
-                                            y_expand: true });
-
-        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel,
-                                        layout_manager: new Clutter.BinLayout() });
-        this._counterBin.hide();
-
-        this._counterBin.connect('style-changed', Lang.bind(this, function() {
-            let themeNode = this._counterBin.get_theme_node();
-            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
-            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
-        }));
-
-        this._iconBin = new St.Bin({ width: size,
-                                     height: size,
-                                     x_fill: true,
-                                     y_fill: true });
-
-        this.actor.add_actor(this._iconBin);
-        this.actor.add_actor(this._counterBin);
-
-        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
-        this._updateCount();
-
-        this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
-        this._updateIcon();
-    },
-
-    setIcon: function(icon) {
-        this._iconBin.child = icon;
-        this._iconSet = true;
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let [min, nat] = this._iconBin.get_preferred_width(forHeight);
-        alloc.min_size = min; alloc.nat_size = nat;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let [min, nat] = this._iconBin.get_preferred_height(forWidth);
-        alloc.min_size = min; alloc.nat_size = nat;
-    },
-
-    _allocate: function(actor, box, flags) {
-        // the iconBin should fill our entire box
-        this._iconBin.allocate(box, flags);
-
-        let childBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
-        let direction = this.actor.get_text_direction();
-
-        if (direction == Clutter.TextDirection.LTR) {
-            // allocate on the right in LTR
-            childBox.x1 = box.x2 - naturalWidth;
-            childBox.x2 = box.x2;
-        } else {
-            // allocate on the left in RTL
-            childBox.x1 = 0;
-            childBox.x2 = naturalWidth;
-        }
-
-        childBox.y1 = box.y2 - naturalHeight;
-        childBox.y2 = box.y2;
-
-        this._counterBin.allocate(childBox, flags);
-    },
-
-    _updateIcon: function() {
-        if (this._actorDestroyed)
-            return;
-
-        if (!this._iconSet)
-            this._iconBin.child = this._source.createIcon(this._size);
-    },
-
-    _updateCount: function() {
-        if (this._actorDestroyed)
-            return;
-
-        this._counterBin.visible = this._source.countVisible;
-
-        let text;
-        if (this._source.count < 100)
-            text = this._source.count.toString();
-        else
-            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
-
-        this._counterLabel.set_text(text);
-    }
-});
-
-const Source = new Lang.Class({
-    Name: 'MessageTraySource',
-
-    SOURCE_ICON_SIZE: 48,
-
-    _init: function(title, iconName) {
-        this.title = title;
-        this.iconName = iconName;
-
-        this.isTransient = false;
-        this.isChat = false;
-        this.isMuted = false;
-        this.showInLockScreen = true;
-        this.keepTrayOnSummaryClick = false;
-
-        this.notifications = [];
-    },
-
-    get count() {
-        return this.notifications.length;
-    },
-
-    get unseenCount() {
-        return this.notifications.filter(function(n) { return !n.acknowledged; }).length;
-    },
-
-    get countVisible() {
-        return this.count > 1;
-    },
-
-    countUpdated: function() {
-        this.emit('count-updated');
-    },
-
-    buildRightClickMenu: function() {
-        let item;
-        let rightClickMenu = new St.BoxLayout({ name: 'summary-right-click-menu',
-                                                vertical: true });
-
-        item = new PopupMenu.PopupMenuItem(_("Open"));
-        item.connect('activate', Lang.bind(this, function() {
-            this.open();
-            this.emit('done-displaying-content');
-        }));
-        rightClickMenu.add(item.actor);
-
-        item = new PopupMenu.PopupMenuItem(_("Remove"));
-        item.connect('activate', Lang.bind(this, function() {
-            this.destroy();
-            this.emit('done-displaying-content');
-        }));
-        rightClickMenu.add(item.actor);
-        return rightClickMenu;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
-    },
-
-    setTitle: function(newTitle) {
-        this.title = newTitle;
-        this.emit('title-changed');
-    },
-
-    setMuted: function(muted) {
-        if (!this.isChat || this.isMuted == muted)
-            return;
-        this.isMuted = muted;
-        this.emit('muted-changed');
-    },
-
-    // Called to create a new icon actor.
-    // Provides a sane default implementation, override if you need
-    // something more fancy.
-    createIcon: function(size) {
-        return new St.Icon({ icon_name: this.iconName,
-                             icon_size: size });
-    },
-
-    _ensureMainIcon: function() {
-        if (this._mainIcon)
-            return;
-
-        this._mainIcon = new SourceActor(this, this.SOURCE_ICON_SIZE);
-    },
-
-    // Unlike createIcon, this always returns the same actor;
-    // there is only one summary icon actor for a Source.
-    getSummaryIcon: function() {
-        this._ensureMainIcon();
-        return this._mainIcon.actor;
-    },
-
-    pushNotification: function(notification) {
-        if (this.notifications.indexOf(notification) < 0) {
-            this.notifications.push(notification);
-            this.emit('notification-added', notification);
-        }
-
-        notification.connect('clicked', Lang.bind(this, this.open));
-        notification.connect('destroy', Lang.bind(this,
-            function () {
-                let index = this.notifications.indexOf(notification);
-                if (index < 0)
-                    return;
-
-                this.notifications.splice(index, 1);
-                if (this.notifications.length == 0)
-                    this._lastNotificationRemoved();
-
-                this.countUpdated();
-            }));
-
-        this.countUpdated();
-    },
-
-    notify: function(notification) {
-        notification.acknowledged = false;
-        this.pushNotification(notification);
-        if (!this.isMuted)
-             this.emit('notify', notification);
-    },
-
-    destroy: function(reason) {
-        this.emit('destroy', reason);
-    },
-
-    // A subclass can redefine this to "steal" clicks from the
-    // summaryitem; Use Clutter.get_current_event() to get the
-    // details, return true to prevent the default handling from
-    // ocurring.
-    handleSummaryClick: function() {
-        return false;
-    },
-
-    iconUpdated: function() {
-        this.emit('icon-updated');
-    },
-
-    //// Protected methods ////
-    _setSummaryIcon: function(icon) {
-        this._ensureMainIcon();
-        this._mainIcon.setIcon(icon);
-        this.iconUpdated();
-    },
-
-    open: function(notification) {
-        this.emit('opened', notification);
-    },
-
-    destroyNonResidentNotifications: function() {
-        for (let i = this.notifications.length - 1; i >= 0; i--)
-            if (!this.notifications[i].resident)
-                this.notifications[i].destroy();
-
-        this.countUpdated();
-    },
-
-    // Default implementation is to destroy this source, but subclasses can override
-    _lastNotificationRemoved: function() {
-        this.destroy();
-    },
-
-    hasResidentNotification: function() {
-        return this.notifications.some(function(n) { return n.resident; });
-    }
-});
-Signals.addSignalMethods(Source.prototype);
-
-const SummaryItem = new Lang.Class({
-    Name: 'SummaryItem',
-
-    _init: function(source) {
-        this.source = source;
-        this.source.connect('notification-added', Lang.bind(this, this._notificationAddedToSource));
-
-        this.actor = new St.Button({ style_class: 'summary-source-button',
-                                     y_fill: true,
-                                     reactive: true,
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO | St.ButtonMask.THREE,
-                                     can_focus: true,
-                                     track_hover: true });
-        this.actor.label_actor = new St.Label({ text: source.title });
-        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
-        this._sourceBox = new St.BoxLayout({ style_class: 'summary-source' });
-
-        this._sourceIcon = source.getSummaryIcon();
-        this._sourceBox.add(this._sourceIcon, { y_fill: false });
-        this.actor.child = this._sourceBox;
-
-        this.notificationStackWidget = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-
-        this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
-                                                         vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
-                                                         hscrollbar_policy: Gtk.PolicyType.NEVER });
-        this.notificationStackView.add_style_class_name('vfade');
-        this.notificationStack = new St.BoxLayout({ style_class: 'summary-notification-stack',
-                                                    vertical: true });
-        this.notificationStackView.add_actor(this.notificationStack);
-        this.notificationStackWidget.add_actor(this.notificationStackView);
-
-        this.closeButton = makeCloseButton();
-        this.notificationStackWidget.add_actor(this.closeButton);
-        this._stackedNotifications = [];
-
-        this._oldMaxScrollAdjustment = 0;
-
-        this.notificationStackView.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
-                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
-        }));
-
-        this.rightClickMenu = source.buildRightClickMenu();
-        if (this.rightClickMenu)
-            global.focus_manager.add_group(this.rightClickMenu);
-    },
-
-    _onKeyPress: function(actor, event) {
-        if (event.get_key_symbol() == Clutter.KEY_Up) {
-            actor.emit('clicked', 1);
-            return true;
-        }
-        return false;
-    },
-
-    prepareNotificationStackForShowing: function() {
-        if (this.notificationStack.get_n_children() > 0)
-            return;
-
-        for (let i = 0; i < this.source.notifications.length; i++) {
-            this._appendNotificationToStack(this.source.notifications[i]);
-        }
-
-        this.scrollTo(St.Side.BOTTOM);
-    },
-
-    doneShowingNotificationStack: function() {
-        for (let i = 0; i < this._stackedNotifications.length; i++) {
-            let stackedNotification = this._stackedNotifications[i];
-            let notification = stackedNotification.notification;
-            notification.collapseCompleted();
-            notification.disconnect(stackedNotification.notificationExpandedId);
-            notification.disconnect(stackedNotification.notificationDoneDisplayingId);
-            notification.disconnect(stackedNotification.notificationDestroyedId);
-            if (notification.actor.get_parent() == this.notificationStack)
-                this.notificationStack.remove_actor(notification.actor);
-            notification.setIconVisible(true);
-            notification.enableScrolling(true);
-        }
-        this._stackedNotifications = [];
-    },
-
-    _notificationAddedToSource: function(source, notification) {
-        if (this.notificationStack.mapped)
-            this._appendNotificationToStack(notification);
-    },
-
-    _appendNotificationToStack: function(notification) {
-        let stackedNotification = {};
-        stackedNotification.notification = notification;
-        stackedNotification.notificationExpandedId = notification.connect('expanded', Lang.bind(this, this._contentUpdated));
-        stackedNotification.notificationDoneDisplayingId = notification.connect('done-displaying', Lang.bind(this, this._notificationDoneDisplaying));
-        stackedNotification.notificationDestroyedId = notification.connect('destroy', Lang.bind(this, this._notificationDestroyed));
-        this._stackedNotifications.push(stackedNotification);
-        if (!this.source.isChat)
-            notification.enableScrolling(false);
-        if (this.notificationStack.get_n_children() > 0)
-            notification.setIconVisible(false);
-        this.notificationStack.add(notification.actor);
-        notification.expand(false);
-    },
-
-    // scrollTo:
-    // @side: St.Side.TOP or St.Side.BOTTOM
-    //
-    // Scrolls the notifiction stack to the indicated edge
-    scrollTo: function(side) {
-        let adjustment = this.notificationStackView.vscroll.adjustment;
-        if (side == St.Side.TOP)
-            adjustment.value = adjustment.lower;
-        else if (side == St.Side.BOTTOM)
-            adjustment.value = adjustment.upper;
-    },
-
-    _contentUpdated: function() {
-        this.emit('content-updated');
-    },
-
-    _notificationDoneDisplaying: function() {
-        this.source.emit('done-displaying-content');
-    },
-
-    _notificationDestroyed: function(notification) {
-        for (let i = 0; i < this._stackedNotifications.length; i++) {
-            if (this._stackedNotifications[i].notification == notification) {
-                let stackedNotification = this._stackedNotifications[i];
-                notification.disconnect(stackedNotification.notificationExpandedId);
-                notification.disconnect(stackedNotification.notificationDoneDisplayingId);
-                notification.disconnect(stackedNotification.notificationDestroyedId);
-                this._stackedNotifications.splice(i, 1);
-                if (notification.actor.get_parent() == this.notificationStack)
-                    this.notificationStack.remove_actor(notification.actor);
-                this._contentUpdated();
-                break;
-            }
-        }
-
-        let firstNotification = this._stackedNotifications[0];
-        if (firstNotification)
-            firstNotification.notification.setIconVisible(true);
-    }
-});
-Signals.addSignalMethods(SummaryItem.prototype);
-
-const MessageTray = new Lang.Class({
-    Name: 'MessageTray',
-
-    _init: function() {
-        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
-            this._onStatusChanged(proxy.status);
-        }));
-        this._busy = false;
-        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-            this._onStatusChanged(status);
-        }));
-
-        this.actor = new St.Widget({ name: 'message-tray',
-                                     reactive: true,
-                                     track_hover: true,
-                                     layout_manager: new Clutter.BinLayout(),
-                                     x_expand: true,
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.START,
-                                   });
-        this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
-
-        this._notificationWidget = new St.Widget({ name: 'notification-container',
-                                                   y_align: Clutter.ActorAlign.START,
-                                                   x_align: Clutter.ActorAlign.CENTER,
-                                                   y_expand: true,
-                                                   x_expand: true,
-                                                   layout_manager: new Clutter.BinLayout() });
-        this.actor.add_actor(this._notificationWidget);
-
-        this._notificationBin = new St.Bin({ y_expand: true });
-        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
-        this._notificationWidget.add_actor(this._notificationBin);
-        this._notificationWidget.hide();
-        this._notificationQueue = [];
-        this._notification = null;
-        this._notificationClickedId = 0;
-
-        this.actor.connect('button-release-event', Lang.bind(this, function(actor, event) {
-            this._setClickedSummaryItem(null);
-            this._updateState();
-            actor.grab_key_focus();
-        }));
-        global.focus_manager.add_group(this.actor);
-        this._summary = new St.BoxLayout({ name: 'summary-mode',
-                                           reactive: true,
-                                           track_hover: true,
-                                           x_align: Clutter.ActorAlign.END,
-                                           x_expand: true,
-                                           y_align: Clutter.ActorAlign.CENTER,
-                                           y_expand: true });
-        this._summary.connect('notify::hover', Lang.bind(this, this._onSummaryHoverChanged));
-        this.actor.add_actor(this._summary);
-        this._summary.opacity = 0;
-
-        this._summaryMotionId = 0;
-        this._trayMotionId = 0;
-
-        this._summaryBoxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
-                                                            { reactive: true,
-                                                              track_hover: true });
-        this._summaryBoxPointer.actor.connect('key-press-event',
-                                              Lang.bind(this, this._onSummaryBoxPointerKeyPress));
-        this._summaryBoxPointer.actor.style_class = 'summary-boxpointer';
-        this._summaryBoxPointer.actor.hide();
-        Main.layoutManager.addChrome(this._summaryBoxPointer.actor);
-
-        this._summaryBoxPointerItem = null;
-        this._summaryBoxPointerContentUpdatedId = 0;
-        this._summaryBoxPointerDoneDisplayingId = 0;
-        this._clickedSummaryItem = null;
-        this._clickedSummaryItemMouseButton = -1;
-        this._clickedSummaryItemAllocationChangedId = 0;
-        this._pointerBarrier = 0;
-
-        this._closeButton = makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
-        this._notificationWidget.add_actor(this._closeButton);
-
-        this._idleMonitorWatchId = 0;
-        this._userActiveWhileNotificationShown = false;
-
-        this.idleMonitor = Shell.IdleMonitor.get();
-
-        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
-        this._grabHelper.addActor(this._summaryBoxPointer.actor);
-        this._grabHelper.addActor(this.actor);
-        if (Main.panel.statusArea.activities)
-            this._grabHelper.addActor(Main.panel.statusArea.activities.hotCorner.actor);
-
-        Main.layoutManager.keyboardBox.connect('notify::hover', Lang.bind(this, this._onKeyboardHoverChanged));
-        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, this._onKeyboardVisibleChanged));
-
-        this._trayState = State.HIDDEN;
-        this._locked = false;
-        this._traySummoned = false;
-        this._useLongerTrayLeftTimeout = false;
-        this._trayLeftTimeoutId = 0;
-        this._pointerInTray = false;
-        this._pointerInKeyboard = false;
-        this._keyboardVisible = false;
-        this._summaryState = State.HIDDEN;
-        this._pointerInSummary = false;
-        this._notificationClosed = false;
-        this._notificationState = State.HIDDEN;
-        this._notificationTimeoutId = 0;
-        this._notificationExpandedId = 0;
-        this._summaryBoxPointerState = State.HIDDEN;
-        this._summaryBoxPointerTimeoutId = 0;
-        this._desktopCloneState = State.HIDDEN;
-        this._overviewVisible = Main.overview.visible;
-        this._notificationRemoved = false;
-        this._reNotifyAfterHideNotification = null;
-        this._inFullscreen = false;
-        this._desktopClone = null;
-
-        this._lightbox = new Lightbox.Lightbox(global.window_group,
-                                               { inhibitEvents: true,
-                                                 fadeInTime: ANIMATION_TIME,
-                                                 fadeOutTime: ANIMATION_TIME,
-                                                 fadeFactor: 0.2
-                                               });
-
-        Main.layoutManager.trayBox.add_actor(this.actor);
-        this.actor.y = 0;
-        Main.layoutManager.trackChrome(this.actor);
-        Main.layoutManager.trackChrome(this._notificationWidget);
-        Main.layoutManager.trackChrome(this._closeButton);
-
-        Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
-
-        Main.overview.connect('showing', Lang.bind(this,
-            function() {
-                this._overviewVisible = true;
-                this._grabHelper.ungrab(); // drop modal grab if necessary
-                this.actor.add_style_pseudo_class('overview');
-                this._updateState();
-            }));
-        Main.overview.connect('hiding', Lang.bind(this,
-            function() {
-                this._overviewVisible = false;
-                this._escapeTray();
-                this.actor.remove_style_pseudo_class('overview');
-                this._updateState();
-            }));
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-
-        global.display.add_keybinding('toggle-message-tray',
-                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                                      Meta.KeyBindingFlags.NONE,
-                                      Lang.bind(this, this.toggleAndNavigate));
-
-        this._summaryItems = [];
-        this._chatSummaryItemsCount = 0;
-
-        let pointerWatcher = PointerWatcher.getPointerWatcher();
-        pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
-        this._trayDwellTimeoutId = 0;
-        this._trayDwelling = false;
-        this._trayDwellUserTime = 0;
-
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        if (Main.sessionMode.isLocked || Main.sessionMode.isGreeter)
-            Main.ctrlAltTabManager.removeGroup(this._summary);
-        else
-            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
-                                            { focusCallback: Lang.bind(this, this.toggleAndNavigate),
-                                              sortGroup: CtrlAltTab.SortGroup.BOTTOM });
-        this._updateState();
-    },
-
-    _checkTrayDwell: function(x, y) {
-        let monitor = Main.layoutManager.bottomMonitor;
-        let shouldDwell = (x >= monitor.x && x <= monitor.x + monitor.width &&
-                           y == monitor.y + monitor.height - 1);
-        if (shouldDwell) {
-            // We only set up dwell timeout when the user is not hovering over the tray
-            // (!this.actor.hover). This avoids bringing up the message tray after the
-            // user clicks on a notification with the pointer on the bottom pixel
-            // of the monitor. The _trayDwelling variable is used so that we only try to
-            // fire off one tray dwell - if it fails (because, say, the user has the mouse down),
-            // we don't try again until the user moves the mouse up and down again.
-            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0) {
-                // Save the interaction timestamp so we can detect user input
-                let focusWindow = global.display.focus_window;
-                this._trayDwellUserTime = focusWindow ? focusWindow.user_time : 0;
-
-                this._trayDwellTimeoutId = Mainloop.timeout_add(TRAY_DWELL_TIME,
-                                                                Lang.bind(this, this._trayDwellTimeout));
-            }
-            this._trayDwelling = true;
-        } else {
-            this._cancelTrayDwell();
-            this._trayDwelling = false;
-        }
-    },
-
-    _cancelTrayDwell: function() {
-        if (this._trayDwellTimeoutId != 0) {
-            Mainloop.source_remove(this._trayDwellTimeoutId);
-            this._trayDwellTimeoutId = 0;
-        }
-    },
-
-    _trayDwellTimeout: function() {
-        if (Main.modalCount > 0)
-            return false;
-
-        // If the user interacted with the focus window since we started the tray
-        // dwell (by clicking or typing), don't activate the message tray
-        let focusWindow = global.display.focus_window;
-        let currentUserTime = focusWindow ? focusWindow.user_time : 0;
-        if (currentUserTime != this._trayDwellUserTime)
-            return false;
-
-        this._trayDwellTimeoutId = 0;
-
-        this._traySummoned = true;
-        this._updateState();
-
-        return false;
-    },
-
-    _onCloseClicked: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notificationClosed = true;
-            this._updateState();
-            this._notificationClosed = false;
-        }
-    },
-
-    contains: function(source) {
-        return this._getIndexOfSummaryItemForSource(source) >= 0;
-    },
-
-    _getIndexOfSummaryItemForSource: function(source) {
-        for (let i = 0; i < this._summaryItems.length; i++) {
-            if (this._summaryItems[i].source == source)
-                return i;
-        }
-        return -1;
-    },
-
-    add: function(source) {
-        if (this.contains(source)) {
-            log('Trying to re-add source ' + source.title);
-            return;
-        }
-
-        let summaryItem = new SummaryItem(source);
-
-        if (source.isChat) {
-            this._summary.insert_child_at_index(summaryItem.actor, 0);
-            this._chatSummaryItemsCount++;
-        } else {
-            this._summary.insert_child_at_index(summaryItem.actor, this._chatSummaryItemsCount);
-        }
-
-        this._summaryItems.push(summaryItem);
-
-        source.connect('notify', Lang.bind(this, this._onNotify));
-
-        source.connect('muted-changed', Lang.bind(this,
-            function () {
-                if (source.isMuted)
-                    this._notificationQueue = this._notificationQueue.filter(function(notification) {
-                        return source != notification.source;
-                    });
-            }));
-
-        summaryItem.actor.connect('clicked', Lang.bind(this,
-            function(actor, button) {
-                actor.grab_key_focus();
-                this._onSummaryItemClicked(summaryItem, button);
-            }));
-        summaryItem.actor.connect('popup-menu', Lang.bind(this,
-            function(actor, button) {
-                actor.grab_key_focus();
-                this._onSummaryItemClicked(summaryItem, 3);
-            }));
-
-        source.connect('destroy', Lang.bind(this, this._onSourceDestroy));
-
-        // We need to display the newly-added summary item, but if the
-        // caller is about to post a notification, we want to show that
-        // *first* and not show the summary item until after it hides.
-        // So postpone calling _updateState() a tiny bit.
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { this._updateState(); return false; }));
-
-        this.emit('summary-item-added', summaryItem);
-    },
-
-    getSummaryItems: function() {
-        return this._summaryItems;
-    },
-
-    _onSourceDestroy: function(source) {
-        let index = this._getIndexOfSummaryItemForSource(source);
-        if (index == -1)
-            return;
-
-        let summaryItemToRemove = this._summaryItems[index];
-
-        this._summaryItems.splice(index, 1);
-
-        if (source.isChat)
-            this._chatSummaryItemsCount--;
-
-        let needUpdate = false;
-
-        if (this._notification && this._notification.source == source) {
-            this._updateNotificationTimeout(0);
-            this._notificationRemoved = true;
-            needUpdate = true;
-        }
-        if (this._clickedSummaryItem == summaryItemToRemove) {
-            this._setClickedSummaryItem(null);
-            needUpdate = true;
-        }
-
-        summaryItemToRemove.actor.destroy();
-
-        if (needUpdate)
-            this._updateState();
-    },
-
-    _onNotificationDestroy: function(notification) {
-        if (this._notification == notification && (this._notificationState == State.SHOWN || this._notificationState == State.SHOWING)) {
-            this._updateNotificationTimeout(0);
-            this._notificationRemoved = true;
-            this._updateState();
-            return;
-        }
-
-        let index = this._notificationQueue.indexOf(notification);
-        notification.destroy();
-        if (index != -1)
-            this._notificationQueue.splice(index, 1);
-    },
-
-    _lock: function() {
-        this._locked = true;
-    },
-
-    _unlock: function() {
-        if (!this._locked)
-            return;
-        this._locked = false;
-        this._pointerInTray = this.actor.hover;
-        this._updateState();
-    },
-
-    toggle: function() {
-        this._traySummoned = !this._traySummoned;
-        this._updateState();
-    },
-
-    toggleAndNavigate: function() {
-        this.toggle();
-        this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
-    hide: function() {
-        this._traySummoned = false;
-        this.actor.set_hover(false);
-        this._summary.set_hover(false);
-        this._updateState();
-    },
-
-    _onNotify: function(source, notification) {
-        if (this._summaryBoxPointerItem && this._summaryBoxPointerItem.source == source) {
-            if (this._summaryBoxPointerState == State.HIDING) {
-                // We are in the process of hiding the summary box pointer.
-                // If there is an update for one of the notifications or
-                // a new notification to be added to the notification stack
-                // while it is in the process of being hidden, we show it as
-                // a new notification. However, we first wait till the hide
-                // is complete. This is especially important if one of the
-                // notifications in the stack was updated because we will
-                // need to be able to re-parent its actor to a different
-                // part of the stage.
-                this._reNotifyAfterHideNotification = notification;
-            } else {
-                // The summary box pointer is showing or shown (otherwise,
-                // this._summaryBoxPointerItem would be null)
-                // Immediately mark the notification as acknowledged, as it's
-                // not going into the queue
-                notification.acknowledged = true;
-            }
-
-            return;
-        }
-
-        if (this._notification == notification) {
-            // If a notification that is being shown is updated, we update
-            // how it is shown and extend the time until it auto-hides.
-            // If a new notification is updated while it is being hidden,
-            // we stop hiding it and show it again.
-            this._updateShowingNotification();
-        } else if (this._notificationQueue.indexOf(notification) < 0) {
-            notification.connect('destroy',
-                                 Lang.bind(this, this._onNotificationDestroy));
-            this._notificationQueue.push(notification);
-            this._notificationQueue.sort(function(notification1, notification2) {
-                return (notification2.urgency - notification1.urgency);
-            });
-        }
-        this._updateState();
-    },
-
-    _onSummaryItemClicked: function(summaryItem, button) {
-        if (summaryItem.source.handleSummaryClick()) {
-            if (summaryItem.source.keepTrayOnSummaryClick)
-                this._setClickedSummaryItem(null);
-            else
-                this._escapeTray();
-        } else {
-            if (!this._setClickedSummaryItem(summaryItem, button))
-                this._setClickedSummaryItem(null);
-        }
-
-        this._updateState();
-    },
-
-    _onSummaryHoverChanged: function() {
-        this._pointerInSummary = this._summary.hover;
-        this._updateState();
-    },
-
-    _onTrayHoverChanged: function() {
-        if (this.actor.hover) {
-            // No dwell inside notifications at the bottom of the screen
-            this._cancelTrayDwell();
-
-            // Don't do anything if the one pixel area at the bottom is hovered over while the tray is hidden.
-            if (this._trayState == State.HIDDEN && this._notificationState == State.HIDDEN)
-                return;
-
-            // Don't do anything if this._useLongerTrayLeftTimeout is true, meaning the notification originally
-            // popped up under the pointer, but this._trayLeftTimeoutId is 0, meaning the pointer didn't leave
-            // the tray yet. We need to check for this case because sometimes _onTrayHoverChanged() gets called
-            // multiple times while this.actor.hover is true.
-            if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId)
-                return;
-
-            this._useLongerTrayLeftTimeout = false;
-            if (this._trayLeftTimeoutId) {
-                Mainloop.source_remove(this._trayLeftTimeoutId);
-                this._trayLeftTimeoutId = 0;
-                this._trayLeftMouseX = -1;
-                this._trayLeftMouseY = -1;
-                return;
-            }
-
-            if (this._showNotificationMouseX >= 0) {
-                let actorAtShowNotificationPosition =
-                    global.stage.get_actor_at_pos(Clutter.PickMode.ALL, this._showNotificationMouseX, this._showNotificationMouseY);
-                this._showNotificationMouseX = -1;
-                this._showNotificationMouseY = -1;
-                // Don't set this._pointerInTray to true if the pointer was initially in the area where the notification
-                // popped up. That way we will not be expanding notifications that happen to pop up over the pointer
-                // automatically. Instead, the user is able to expand the notification by mousing away from it and then
-                // mousing back in. Because this is an expected action, we set the boolean flag that indicates that a longer
-                // timeout should be used before popping down the notification.
-                if (this.actor.contains(actorAtShowNotificationPosition)) {
-                    this._useLongerTrayLeftTimeout = true;
-                    return;
-                }
-            }
-            this._pointerInTray = true;
-            this._updateState();
-        } else {
-            // We record the position of the mouse the moment it leaves the tray. These coordinates are used in
-            // this._onTrayLeftTimeout() to determine if the mouse has moved far enough during the initial timeout for us
-            // to consider that the user intended to leave the tray and therefore hide the tray. If the mouse is still
-            // close to its previous position, we extend the timeout once.
-            let [x, y, mods] = global.get_pointer();
-            this._trayLeftMouseX = x;
-            this._trayLeftMouseY = y;
-
-            // We wait just a little before hiding the message tray in case the user quickly moves the mouse back into it.
-            // We wait for a longer period if the notification popped up where the mouse pointer was already positioned.
-            // That gives the user more time to mouse away from the notification and mouse back in in order to expand it.
-            let timeout = this._useLongerTrayLeftTimeout ? LONGER_HIDE_TIMEOUT * 1000 : HIDE_TIMEOUT * 1000;
-            this._trayLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onTrayLeftTimeout));
-        }
-    },
-
-    _onKeyboardHoverChanged: function(keyboard) {
-        this._pointerInKeyboard = keyboard.hover;
-
-        if (!keyboard.hover) {
-            let event = Clutter.get_current_event();
-            if (event && event.type() == Clutter.EventType.LEAVE) {
-                let into = event.get_related();
-                if (into && this.actor.contains(into)) {
-                    // Don't call _updateState, because pointerInTray is
-                    // still false
-                    return;
-                }
-            }
-        }
-
-        this._updateState();
-    },
-
-    _onKeyboardVisibleChanged: function(layoutManager, keyboardVisible) {
-        if (this._keyboardVisible == keyboardVisible)
-            return;
-
-        this._keyboardVisible = keyboardVisible;
-
-        if (keyboardVisible)
-            this.actor.add_style_pseudo_class('keyboard');
-        else
-            this.actor.remove_style_pseudo_class('keyboard');
-
-        this._updateState();
-    },
-
-    _onFullscreenChanged: function(obj, state) {
-        this._inFullscreen = state;
-        this._updateState();
-    },
-
-    _onStatusChanged: function(status) {
-        if (status == GnomeSession.PresenceStatus.BUSY) {
-            // remove notification and allow the summary to be closed now
-            this._updateNotificationTimeout(0);
-            this._busy = true;
-        } else if (status != GnomeSession.PresenceStatus.IDLE) {
-            // We preserve the previous value of this._busy if the status turns to IDLE
-            // so that we don't start showing notifications queued during the BUSY state
-            // as the screensaver gets activated.
-            this._busy = false;
-        }
-
-        this._updateState();
-    },
-
-    _onTrayLeftTimeout: function() {
-        let [x, y, mods] = global.get_pointer();
-        // We extend the timeout once if the mouse moved no further than MOUSE_LEFT_ACTOR_THRESHOLD to either side or up.
-        // We don't check how far down the mouse moved because any point above the tray, but below the exit coordinate,
-        // is close to the tray.
-        if (this._trayLeftMouseX > -1 &&
-            y > this._trayLeftMouseY - MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x < this._trayLeftMouseX + MOUSE_LEFT_ACTOR_THRESHOLD &&
-            x > this._trayLeftMouseX - MOUSE_LEFT_ACTOR_THRESHOLD) {
-            this._trayLeftMouseX = -1;
-            this._trayLeftTimeoutId = Mainloop.timeout_add(LONGER_HIDE_TIMEOUT * 1000,
-                                                             Lang.bind(this, this._onTrayLeftTimeout));
-        } else {
-            this._trayLeftTimeoutId = 0;
-            this._useLongerTrayLeftTimeout = false;
-            this._pointerInTray = false;
-            this._pointerInSummary = false;
-            this._updateNotificationTimeout(0);
-            this._updateState();
-        }
-        return false;
-    },
-
-    _escapeTray: function() {
-        this._unlock();
-        this._pointerInTray = false;
-        this._pointerInSummary = false;
-        this._traySummoned = false;
-        this._setClickedSummaryItem(null);
-        this._updateNotificationTimeout(0);
-        this._updateState();
-    },
-
-    // All of the logic for what happens when occurs here; the various
-    // event handlers merely update variables such as
-    // 'this._pointerInTray', 'this._summaryState', etc, and
-    // _updateState() figures out what (if anything) needs to be done
-    // at the present time.
-    _updateState: function() {
-        // Notifications
-        let notificationQueue = this._notificationQueue;
-        let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationsLimited = this._busy || this._inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
-        let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
-        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
-        let notificationExpanded = this._notification && this._notification.expanded;
-        let notificationExpired = this._notificationTimeoutId == 0 &&
-                                  !(this._notification && this._notification.urgency == Urgency.CRITICAL) &&
-                                  !(this._notification && this._notification.focused) &&
-                                  !this._pointerInTray &&
-                                  !this._locked &&
-                                  !(this._pointerInKeyboard && notificationExpanded);
-        let notificationLockedOut = !Main.sessionMode.hasNotifications && this._notification;
-        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
-        let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
-
-        if (this._notificationState == State.HIDDEN) {
-            if (canShowNotification) {
-                this._showNotification();
-            }
-        } else if (this._notificationState == State.SHOWN) {
-            if (notificationMustClose)
-                this._hideNotification();
-            else if (notificationPinned && !notificationExpanded)
-                this._expandNotification(false);
-            else if (notificationPinned)
-                this._ensureNotificationFocused();
-        }
-
-        // Summary
-        let summarySummoned = this._pointerInSummary || this._overviewVisible ||  this._traySummoned;
-        let summaryPinned = this._pointerInTray || summarySummoned || this._locked;
-        let summaryHovered = this._pointerInTray || this._pointerInSummary;
-
-        let notificationsVisible = (this._notificationState == State.SHOWING ||
-                                    this._notificationState == State.SHOWN);
-        let notificationsDone = !notificationsVisible && !notificationsPending;
-
-        let summaryOptionalInOverview = this._overviewVisible && !this._locked && !summaryHovered;
-        let mustHideSummary = (notificationsPending && (notificationUrgent || summaryOptionalInOverview))
-                              || notificationsVisible || !Main.sessionMode.hasNotifications;
-
-        if (this._summaryState == State.HIDDEN && !mustHideSummary && summarySummoned)
-            this._showSummary();
-        else if (this._summaryState == State.SHOWN && (!summaryPinned || mustHideSummary))
-            this._hideSummary();
-
-        // Summary notification
-        let haveClickedSummaryItem = this._clickedSummaryItem != null;
-        let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification &&
-                                                     this._clickedSummaryItem.source == this._notification.source);
-        let canShowSummaryBoxPointer = this._summaryState == State.SHOWN;
-        // We only have sources with empty notification stacks for legacy tray icons. Currently, we never attempt
-        // to show notifications for legacy tray icons, but this would be necessary if we did.
-        let requestedNotificationStackIsEmpty = (this._clickedSummaryItemMouseButton == 1 && this._clickedSummaryItem.source.notifications.length == 0);
-        let wrongSummaryNotificationStack = (this._clickedSummaryItemMouseButton == 1 &&
-                                             this._summaryBoxPointer.bin.child != this._clickedSummaryItem.notificationStackWidget);
-        let wrongSummaryRightClickMenu = (this._clickedSummaryItemMouseButton == 3 &&
-                                          this._summaryBoxPointer.bin.child != this._clickedSummaryItem.rightClickMenu);
-        let wrongSummaryBoxPointer = (haveClickedSummaryItem &&
-                                      (wrongSummaryNotificationStack || wrongSummaryRightClickMenu));
-
-        if (this._summaryBoxPointerState == State.HIDDEN) {
-            if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
-                this._showSummaryBoxPointer();
-        } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideSummary) {
-                this._hideSummaryBoxPointer();
-                if (wrongSummaryBoxPointer)
-                    this._showSummaryBoxPointer();
-            }
-        }
-
-        // Tray itself
-        let trayIsVisible = (this._trayState == State.SHOWING ||
-                             this._trayState == State.SHOWN);
-        let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
-                                   this._summaryState == State.SHOWN);
-        if (!trayIsVisible && trayShouldBeVisible)
-            trayShouldBeVisible = this._showTray();
-        else if (trayIsVisible && !trayShouldBeVisible)
-            this._hideTray();
-
-        // Desktop clone
-        let desktopCloneIsVisible = (this._desktopCloneState == State.SHOWING ||
-                                     this._desktopCloneState == State.SHOWN);
-        let desktopCloneShouldBeVisible = (trayShouldBeVisible &&
-                                           !this._overviewVisible &&
-                                           !this._keyboardVisible);
-
-        if (!desktopCloneIsVisible && desktopCloneShouldBeVisible) {
-            this._showDesktopClone();
-        } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
-            this._hideDesktopClone (this._keyboardVisible);
-        }
-    },
-
-    _tween: function(actor, statevar, value, params) {
-        let onComplete = params.onComplete;
-        let onCompleteScope = params.onCompleteScope;
-        let onCompleteParams = params.onCompleteParams;
-
-        params.onComplete = this._tweenComplete;
-        params.onCompleteScope = this;
-        params.onCompleteParams = [statevar, value, onComplete, onCompleteScope, onCompleteParams];
-
-        Tweener.addTween(actor, params);
-
-        let valuing = (value == State.SHOWN) ? State.SHOWING : State.HIDING;
-        this[statevar] = valuing;
-    },
-
-    _tweenComplete: function(statevar, value, onComplete, onCompleteScope, onCompleteParams) {
-        this[statevar] = value;
-        if (onComplete)
-            onComplete.apply(onCompleteScope, onCompleteParams);
-        this._updateState();
-    },
-
-    _showTray: function() {
-        // Don't actually take a modal grab in the overview.
-        // Just add something to the grab stack that we can
-        // pop later.
-        let modal = !this._overviewVisible;
-
-        if (!this._grabHelper.grab({ actor: this.actor,
-                                     modal: modal,
-                                     onUngrab: Lang.bind(this, this._escapeTray) })) {
-            this._traySummoned = false;
-            return false;
-        }
-
-        this._tween(this.actor, '_trayState', State.SHOWN,
-                    { y: -this.actor.height,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad'
-                    });
-
-        if (!this._overviewVisible)
-            this._lightbox.show();
-
-        return true;
-    },
-
-    _updateDesktopCloneClip: function() {
-        let geometry = this._bottomMonitorGeometry;
-        let progress = -Math.round(this._desktopClone.y);
-        this._desktopClone.set_clip(geometry.x,
-                                    geometry.y + progress,
-                                    geometry.width,
-                                    geometry.height - progress);
-    },
-
-    _showDesktopClone: function() {
-        let bottomMonitor = Main.layoutManager.bottomMonitor;
-        this._bottomMonitorGeometry = { x: bottomMonitor.x,
-                                        y: bottomMonitor.y,
-                                        width: bottomMonitor.width,
-                                        height: bottomMonitor.height };
-
-        if (this._desktopClone)
-            this._desktopClone.destroy();
-        this._desktopClone = new Clutter.Clone({ source: global.window_group, clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
-        Main.uiGroup.insert_child_above(this._desktopClone, global.window_group);
-        this._desktopClone.x = 0;
-        this._desktopClone.y = 0;
-        this._desktopClone.show();
-
-        this._tween(this._desktopClone, '_desktopCloneState', State.SHOWN,
-                    { y: -this.actor.height,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
-                    });
-    },
-
-    _hideTray: function() {
-        // Having the summary item animate out while sliding down the tray
-        // is distracting, so hide it immediately in case it was visible.
-        this._summaryBoxPointer.actor.hide();
-
-        this._tween(this.actor, '_trayState', State.HIDDEN,
-                    { y: 0,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad'
-                    });
-
-        // Note that we might have entered here without a grab,
-        // which would happen if GrabHelper ungrabbed for us.
-        // This is a no-op in that case.
-        this._grabHelper.ungrab({ actor: this.actor });
-        this._lightbox.hide();
-    },
-
-    _hideDesktopClone: function(now) {
-        this._tween(this._desktopClone, '_desktopCloneState', State.HIDDEN,
-                    { y: 0,
-                      time: now ? 0 : ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onComplete: Lang.bind(this, function() {
-                          this._desktopClone.destroy();
-                          this._desktopClone = null;
-                          this._bottomMonitorGeometry = null;
-                      }),
-                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
-                    });
-    },
-
-    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
-        this.idleMonitor.remove_watch(this._idleMonitorWatchId);
-        this._idleMonitorWatchId = 0;
-        if (!userBecameIdle)
-            this._updateNotificationTimeout(2000);
-        this._userActiveWhileNotificationShown = true;
-        this._updateState();
-    },
-
-    _showNotification: function() {
-        this._notification = this._notificationQueue.shift();
-        this._userActiveWhileNotificationShown = this.idleMonitor.get_idletime() <= IDLE_TIME;
-        this._idleMonitorWatchId = this.idleMonitor.add_watch(IDLE_TIME,
-                                                              Lang.bind(this, this._onIdleMonitorWatch));
-        this._notificationClickedId = this._notification.connect('done-displaying',
-                                                                 Lang.bind(this, this._escapeTray));
-        this._notification.connect('unfocused', Lang.bind(this, function() {
-            this._updateState();
-        }));
-        this._notificationBin.child = this._notification.actor;
-
-        this._notificationWidget.opacity = 0;
-        this._notificationWidget.y = 0;
-        this._notificationWidget.show();
-
-        this._updateShowingNotification();
-
-        let [x, y, mods] = global.get_pointer();
-        // We save the position of the mouse at the time when we started showing the notification
-        // in order to determine if the notification popped up under it. We make that check if
-        // the user starts moving the mouse and _onTrayHoverChanged() gets called. We don't
-        // expand the notification if it just happened to pop up under the mouse unless the user
-        // explicitly mouses away from it and then mouses back in.
-        this._showNotificationMouseX = x;
-        this._showNotificationMouseY = y;
-        // We save the coordinates of the mouse at the time when we started showing the notification
-        // and then we update it in _notificationTimeout(). We don't pop down the notification if
-        // the mouse is moving towards it or within it.
-        this._lastSeenMouseX = x;
-        this._lastSeenMouseY = y;
-    },
-
-    _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)
-            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).
-        // 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.
-        //
-        // 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,
-                            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);
-   },
-
-    _showNotificationCompleted: function() {
-        if (this._notification.urgency != Urgency.CRITICAL)
-            this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
-    },
-
-    _updateNotificationTimeout: function(timeout) {
-        if (this._notificationTimeoutId) {
-            Mainloop.source_remove(this._notificationTimeoutId);
-            this._notificationTimeoutId = 0;
-        }
-        if (timeout > 0)
-            this._notificationTimeoutId =
-                Mainloop.timeout_add(timeout,
-                                     Lang.bind(this, this._notificationTimeout));
-    },
-
-    _notificationTimeout: function() {
-        let [x, y, mods] = global.get_pointer();
-        if (y > this._lastSeenMouseY + 10 && !this.actor.hover) {
-            // The mouse is moving towards the notification, so don't
-            // hide it yet. (We just create a new timeout (and destroy
-            // the old one) each time because the bookkeeping is
-            // simpler.)
-            this._updateNotificationTimeout(1000);
-        } else if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId &&
-                  (x != this._lastSeenMouseX || y != this._lastSeenMouseY)) {
-            // Refresh the timeout if the notification originally
-            // popped up under the pointer, and the pointer is hovering
-            // inside it.
-            this._updateNotificationTimeout(1000);
-        } else {
-            this._notificationTimeoutId = 0;
-            this._updateState();
-        }
-
-        this._lastSeenMouseX = x;
-        this._lastSeenMouseY = y;
-        return false;
-    },
-
-    _hideNotification: function() {
-        this._grabHelper.ungrab({ actor: this._notification.actor });
-
-        if (this._notificationExpandedId) {
-            this._notification.disconnect(this._notificationExpandedId);
-            this._notificationExpandedId = 0;
-        }
-
-        if (this._notificationRemoved) {
-            this._notificationWidget.y = this.actor.height;
-            this._notificationWidget.opacity = 0;
-            this._notificationState = State.HIDDEN;
-            this._hideNotificationCompleted();
-        } else {
-            this._tween(this._notificationWidget, '_notificationState', State.HIDDEN,
-                        { y: this.actor.height,
-                          opacity: 0,
-                          time: ANIMATION_TIME,
-                          transition: 'easeOutQuad',
-                          onComplete: this._hideNotificationCompleted,
-                          onCompleteScope: this
-                        });
-
-        }
-    },
-
-    _hideNotificationCompleted: function() {
-        this._notificationRemoved = false;
-        this._notificationWidget.hide();
-        this._closeButton.hide();
-        this._pointerInTray = false;
-        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
-        this._notificationBin.child = null;
-        this._notification.collapseCompleted();
-        this._notification.disconnect(this._notificationClickedId);
-        this._notificationClickedId = 0;
-        let notification = this._notification;
-        this._notification = null;
-        if (notification.isTransient)
-            notification.destroy(NotificationDestroyedReason.EXPIRED);
-    },
-
-    _expandNotification: function(autoExpanding) {
-        // Don't grab focus in notifications that are auto-expanded.
-        if (!autoExpanding)
-            this._grabHelper.grab({ actor: this._notification.actor,
-                                    grabFocus: true });
-
-        if (!this._notificationExpandedId)
-            this._notificationExpandedId =
-                this._notification.connect('expanded',
-                                           Lang.bind(this, this._onNotificationExpanded));
-        // Don't animate changes in notifications that are auto-expanding.
-        this._notification.expand(!autoExpanding);
-    },
-
-    _onNotificationExpanded: function() {
-        let expandedY = - this._notificationWidget.height;
-        this._closeButton.show();
-
-        // Don't animate the notification to its new position if it has shrunk:
-        // there will be a very visible "gap" that breaks the illusion.
-        if (this._notificationWidget.y < expandedY) {
-            this._notificationWidget.y = expandedY;
-        } else if (this._notification.y != expandedY) {
-            this._tween(this._notificationWidget, '_notificationState', State.SHOWN,