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

powerMenu: Use LoginManager for suspend

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=686482
This commit is contained in:
Florian Müllner 2012-10-19 17:40:55 +02:00
parent 1f183b8a4e
commit 990443465f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/gdm/powerMenu.js
View File

@ -20,7 +20,6 @@
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const Lang = imports.lang; const Lang = imports.lang;
const UPowerGlib = imports.gi.UPowerGlib;
const LoginManager = imports.misc.loginManager; const LoginManager = imports.misc.loginManager;
@ -35,7 +34,6 @@ const PowerMenuButton = new Lang.Class({
_init: function() { _init: function() {
/* Translators: accessible name of the power menu in the login screen */ /* Translators: accessible name of the power menu in the login screen */
this.parent('system-shutdown-symbolic', _("Power")); this.parent('system-shutdown-symbolic', _("Power"));
this._upClient = new UPowerGlib.Client();
this._loginManager = LoginManager.getLoginManager(); this._loginManager = LoginManager.getLoginManager();
@ -45,10 +43,6 @@ const PowerMenuButton = new Lang.Class({
this._createSubMenu(); this._createSubMenu();
this._upClient.connect('notify::can-suspend',
Lang.bind(this, this._updateHaveSuspend));
this._updateHaveSuspend();
// ConsoleKit doesn't send notifications when shutdown/reboot // ConsoleKit doesn't send notifications when shutdown/reboot
// are disabled, so we update the menu item each time the menu opens // are disabled, so we update the menu item each time the menu opens
this.menu.connect('open-state-changed', Lang.bind(this, this.menu.connect('open-state-changed', Lang.bind(this,
@ -56,10 +50,12 @@ const PowerMenuButton = new Lang.Class({
if (open) { if (open) {
this._updateHaveShutdown(); this._updateHaveShutdown();
this._updateHaveRestart(); this._updateHaveRestart();
this._updateHaveSuspend();
} }
})); }));
this._updateHaveShutdown(); this._updateHaveShutdown();
this._updateHaveRestart(); this._updateHaveRestart();
this._updateHaveSuspend();
}, },
_updateVisibility: function() { _updateVisibility: function() {
@ -84,9 +80,11 @@ const PowerMenuButton = new Lang.Class({
}, },
_updateHaveSuspend: function() { _updateHaveSuspend: function() {
this._haveSuspend = this._upClient.get_can_suspend(); this._loginManager.canSuspend(Lang.bind(this, function(result) {
this._haveSuspend = result;
this._suspendItem.actor.visible = this._haveSuspend; this._suspendItem.actor.visible = this._haveSuspend;
this._updateVisibility(); this._updateVisibility();
}));
}, },
_createSubMenu: function() { _createSubMenu: function() {
@ -109,8 +107,10 @@ const PowerMenuButton = new Lang.Class({
}, },
_onActivateSuspend: function() { _onActivateSuspend: function() {
if (this._haveSuspend) if (!this._haveSuspend)
this._upClient.suspend_sync(null); return;
this._loginManager.suspend();
}, },
_onActivateRestart: function() { _onActivateRestart: function() {