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

messageTray: Do not add the tray unconditionally to ctrl-alt-tab

Browse Source 
Commit 448517032e added the message tray unconditionally to
the Ctrl-Alt-Tab popup, but while this makes sense for a normal
session, we do not want it in the login screen.
Be a bit more careful where we make the tray available.

https://bugzilla.gnome.org/show_bug.cgi?id=685914
This commit is contained in:
Florian Müllner 2012-10-10 22:17:39 +02:00
parent 1e942be639
commit d2e830cce3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/messageTray.js
View File

@ -1514,7 +1514,7 @@ const MessageTray = new Lang.Class({
this._updateState(); this._updateState();
})); }));
Main.sessionMode.connect('updated', Lang.bind(this, this._updateState)); Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
global.display.add_keybinding('toggle-message-tray', global.display.add_keybinding('toggle-message-tray',
new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }), new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
@ -1530,9 +1530,17 @@ const MessageTray = new Lang.Class({
this._trayDwelling = false; this._trayDwelling = false;
this._trayDwellUserTime = 0; 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', Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
{ focusCallback: Lang.bind(this, this.toggleAndNavigate), { focusCallback: Lang.bind(this, this.toggleAndNavigate),
sortGroup: CtrlAltTab.SortGroup.BOTTOM }); sortGroup: CtrlAltTab.SortGroup.BOTTOM });
this._updateState();
}, },
_checkTrayDwell: function(x, y) { _checkTrayDwell: function(x, y) {