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

ScreenShield: use session mode to handle the GDM login dialog

Browse Source 
Have main.js call .showDialog() when going back from the lock-screen, instead
of using the return value of createUnlockDialog to know if the dialog
was persistent.
_keepDialog is still used as LoginDialog cannot really be destroyed,
and cancelling it does not destroy it.

https://bugzilla.gnome.org/show_bug.cgi?id=683156
This commit is contained in:
Giovanni Campagna
2012-09-04 19:28:19 +02:00
parent cebd8e14e9
commit 92d8d65543
3 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
js/ui/sessionMode.js
View File

@ -19,7 +19,8 @@ const _modes = {
hasWorkspaces: false,
hasWindows: false,
isLocked: false,
createUnlockDialog: null,
isGreeter: false,
unlockDialog: null,
components: [],
panel: {
left: [],
@ -30,7 +31,8 @@ const _modes = {
'gdm': {
allowKeybindingsWhenModal: true,
createUnlockDialog: Main.createGDMLoginDialog,
isGreeter: true,
unlockDialog: imports.gdm.loginDialog.LoginDialog,
panel: {
left: [],
center: ['dateMenu'],
@ -41,8 +43,9 @@ const _modes = {
'lock-screen': {
isLocked: true,
isGreeter: undefined,
unlockDialog: undefined,
components: ['networkAgent', 'polkitAgent', 'telepathyClient'],
createUnlockDialog: Main.createSessionUnlockDialog,
panel: {
left: ['userMenu'],
center: [],
@ -67,6 +70,8 @@ const _modes = {
hasRunDialog: true,
hasWorkspaces: true,
hasWindows: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
isLocked: false,
components: ['networkAgent', 'polkitAgent', 'telepathyClient',
'keyring', 'recorder', 'autorunManager', 'automountManager'],
panel: {
@ -113,18 +118,14 @@ const SessionMode = new Lang.Class({
let params = _modes[this.currentMode];
params = Params.parse(params, _modes[DEFAULT_MODE]);
this._createUnlockDialog = params.createUnlockDialog;
delete params.createUnlockDialog;
// A simplified version of Lang.copyProperties, handles
// undefined as a special case for "no change / inherit from previous mode"
for (let prop in params) {
if (params[prop] !== undefined)
this[prop] = params[prop];
}
Lang.copyProperties(params, this);
this.emit('updated');
},
createUnlockDialog: function() {
if (this._createUnlockDialog)
return this._createUnlockDialog.apply(this, arguments);
else
return null;
},
}
});
Signals.addSignalMethods(SessionMode.prototype);