From 2df0c02dfd86c93c22dc7b845c15ae6fe84ec127 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 1 Aug 2013 23:33:56 -0400 Subject: [PATCH] messageTray: Remove some more dead code It's impossible to have a clicked summary item if we have a main notification or the tray is hidden, and has been ever since 3.6. --- js/ui/messageTray.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index 41ae340d6..9705fcb5d 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -2302,9 +2302,6 @@ const MessageTray = new Lang.Class({ // Summary notification let haveClickedSummaryItem = this._clickedSummaryItem != null; - let summarySourceIsMainNotificationSource = (haveClickedSummaryItem && this._notification && - this._clickedSummaryItem.source == this._notification.source); - let canShowSummaryBoxPointer = this._trayState == 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 = (haveClickedSummaryItem && @@ -2321,10 +2318,10 @@ const MessageTray = new Lang.Class({ (wrongSummaryNotificationStack || wrongSummaryRightClickMenu)); if (this._summaryBoxPointerState == State.HIDDEN) { - if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty) + if (haveClickedSummaryItem && !requestedNotificationStackIsEmpty) this._showSummaryBoxPointer(); } else if (this._summaryBoxPointerState == State.SHOWN) { - if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || !hasNotifications) { + if (!haveClickedSummaryItem || wrongSummaryBoxPointer || !hasNotifications) { this._hideSummaryBoxPointer(); if (wrongSummaryBoxPointer) this._showSummaryBoxPointer();