isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Remove code that happens on notification destruction

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-08-02 00:09:33 -04:00
parent de050991d4
commit c4bc9616af
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/messageTray.js
View File

@ -1950,26 +1950,11 @@ const MessageTray = new Lang.Class({
source.disconnect(obj.destroyId); source.disconnect(obj.destroyId);
source.disconnect(obj.mutedChangedId); source.disconnect(obj.mutedChangedId);
let needUpdate = false;
if (this._notification && this._notification.source == source) {
this._updateNotificationTimeout(0);
this._notificationRemoved = true;
needUpdate = true;
}
if (this._clickedSummaryItem == summaryItem) {
this._setClickedSummaryItem(null);
needUpdate = true;
}
summaryItem.destroy(); summaryItem.destroy();
this.emit('source-removed', source); this.emit('source-removed', source);
this._updateNoMessagesLabel(); this._updateNoMessagesLabel();
if (needUpdate)
this._updateState();
}, },
getSources: function() { getSources: function() {
@ -2689,6 +2674,10 @@ const MessageTray = new Lang.Class({
if (this._clickedSummaryItem) { if (this._clickedSummaryItem) {
this._clickedSummaryItem.actor.add_style_pseudo_class('selected'); this._clickedSummaryItem.actor.add_style_pseudo_class('selected');
this._clickedSummaryItem.actor.connect('destroy', Lang.bind(this, function() {
this._setClickedSummaryItem(null);
this._updateState();
}));
this._clickedSummaryItemAllocationChangedId = this._clickedSummaryItemAllocationChangedId =
this._clickedSummaryItem.actor.connect('allocation-changed', this._clickedSummaryItem.actor.connect('allocation-changed',
Lang.bind(this, this._adjustSummaryBoxPointerPosition)); Lang.bind(this, this._adjustSummaryBoxPointerPosition));