MessageTray: fix popping up after there were modals

Open a modal dialog, try to open the message tray -> no effect, the message
tray is blocked by the dialog.
Close the dialog, try to open the message tray by pointer -> still
no effect, because the old timeout id was not cleared the first time,
so the dwell callback thinks the tray is about to open.

https://bugzilla.gnome.org/show_bug.cgi?id=688750
This commit is contained in:
Giovanni Campagna 2012-11-20 19:53:22 +01:00
parent a370697385
commit 3b70094151

View File

@ -1606,6 +1606,8 @@ const MessageTray = new Lang.Class({
}, },
_trayDwellTimeout: function() { _trayDwellTimeout: function() {
this._trayDwellTimeoutId = 0;
if (Main.modalCount > 0) if (Main.modalCount > 0)
return false; return false;
@ -1616,8 +1618,6 @@ const MessageTray = new Lang.Class({
if (currentUserTime != this._trayDwellUserTime) if (currentUserTime != this._trayDwellUserTime)
return false; return false;
this._trayDwellTimeoutId = 0;
this._traySummoned = true; this._traySummoned = true;
this._updateState(); this._updateState();