[gnome-shell/wip/gtk-notification: 39/40] messageTray: Remove reNotifyAfterHideNotification logic
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/gtk-notification: 39/40] messageTray: Remove reNotifyAfterHideNotification logic
- Date: Mon, 21 Oct 2013 17:18:23 +0000 (UTC)
commit 9b048a6163093b71c18b9d66c7b489b4abc0e05e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Oct 13 22:41:10 2013 -0400
messageTray: Remove reNotifyAfterHideNotification logic
When we hide the summary box pointer, we always drop to the tray
instead of the desktop, so this code would simply drop the notification
anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=710115
js/ui/messageTray.js | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index b255a17..d80c918 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1855,7 +1855,6 @@ const MessageTray = new Lang.Class({
this._summaryBoxPointerTimeoutId = 0;
this._desktopCloneState = State.HIDDEN;
this._notificationRemoved = false;
- this._reNotifyAfterHideNotification = null;
this._desktopClone = null;
this._inCtrlAltTab = false;
@@ -2186,26 +2185,8 @@ const MessageTray = new Lang.Class({
_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 and play its
- // sound, as it's not going into the queue
- notification.acknowledged = true;
- notification.playSound();
- }
-
+ notification.acknowledged = true;
+ notification.playSound();
return;
}
@@ -2905,11 +2886,6 @@ const MessageTray = new Lang.Class({
this._summaryBoxPointerItem.doneShowingNotificationStack();
this._summaryBoxPointerItem = null;
-
- if (this._reNotifyAfterHideNotification) {
- this._onNotify(this._reNotifyAfterHideNotification.source,
this._reNotifyAfterHideNotification);
- this._reNotifyAfterHideNotification = null;
- }
}
if (this._clickedSummaryItem)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]