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

statusMenu.js: Ensure screensaver is locked before switching users

Browse Source 
Somewhat similar to (see bug 637540), we need to lock the screensaver
*before* asking GDM to switch.

https://bugzilla.gnome.org/show_bug.cgi?id=654565
This commit is contained in:
Colin Walters 2011-07-05 09:29:05 -04:00
parent 664245d2a6
commit c632074ba7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/statusMenu.js
View File

@ -301,8 +301,11 @@ StatusMenuButton.prototype = {
_onLoginScreenActivate: function() { _onLoginScreenActivate: function() {
Main.overview.hide(); Main.overview.hide();
// Ensure we only move to GDM after the screensaver has activated; in some
// OS configurations, the X server may block event processing on VT switch
this._screenSaverProxy.setActiveRemote(true, Lang.bind(this, function() {
this._gdm.goto_login_session(); this._gdm.goto_login_session();
this._onLockScreenActivate(); }));
}, },
_onQuitSessionActivate: function() { _onQuitSessionActivate: function() {
@ -315,6 +318,7 @@ StatusMenuButton.prototype = {
if (this._haveSuspend && if (this._haveSuspend &&
this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) { this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
// Ensure we only suspend after the screensaver has activated
this._screenSaverProxy.SetActiveRemote(true, Lang.bind(this, function() { this._screenSaverProxy.SetActiveRemote(true, Lang.bind(this, function() {
this._upClient.suspend_sync(null); this._upClient.suspend_sync(null);
})); }));