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

Adjust for renamed action mode

Browse Source 
Commit c79d24b60e renamed the TOPBAR_POPUP mode to POPUP to
reflect its new usage, but did not update any code that used it.
Whoops.
This commit is contained in:
Florian Müllner 2015-02-26 01:00:41 +01:00
parent 62e9978c52
commit 530e8273ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/status/keyboard.js
View File

@ -243,7 +243,7 @@ const InputSourceManager = new Lang.Class({
// of pushModal/popModal and grabHelper. See
// https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
if (Main.actionMode == Shell.ActionMode.MESSAGE_TRAY ||
Main.actionMode == Shell.ActionMode.TOPBAR_POPUP) {
Main.actionMode == Shell.ActionMode.POPUP) {
this._modifiersSwitcher();
return;
}

4
js/ui/windowManager.js
View File

@ -831,14 +831,14 @@ const WindowManager = new Lang.Class({
new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
Meta.KeyBindingFlags.NONE,
Shell.ActionMode.NORMAL |
Shell.ActionMode.TOPBAR_POPUP,
Shell.ActionMode.POPUP,
Lang.bind(this, this._toggleAppMenu));
this.addKeybinding('toggle-message-tray',
new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
Meta.KeyBindingFlags.NONE,
Shell.ActionMode.NORMAL |
Shell.ActionMode.TOPBAR_POPUP,
Shell.ActionMode.POPUP,
Lang.bind(this, this._toggleCalendar));
global.display.connect('show-resize-popup', Lang.bind(this, this._showResizePopup));