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

loginManager: Make suspend() a NOP in the ConsoleKit path

Browse Source 
UPower will remove its suspend support eventually, and g-s-d already
depends on logind for power management.

https://bugzilla.gnome.org/show_bug.cgi?id=693162
This commit is contained in:
Florian Müllner 2013-02-03 21:53:33 +01:00
parent 140935bca3
commit b91d9c2867
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/misc/loginManager.js
View File

@ -5,7 +5,6 @@ const Gio = imports.gi.Gio;
const Lang = imports.lang; const Lang = imports.lang;
const Mainloop = imports.mainloop; const Mainloop = imports.mainloop;
const Shell = imports.gi.Shell; const Shell = imports.gi.Shell;
const UPowerGlib = imports.gi.UPowerGlib;
const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'> const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
<method name='PowerOff'> <method name='PowerOff'>
@ -150,7 +149,6 @@ const LoginManagerConsoleKit = new Lang.Class({
this._proxy = new ConsoleKitManager(Gio.DBus.system, this._proxy = new ConsoleKitManager(Gio.DBus.system,
'org.freedesktop.ConsoleKit', 'org.freedesktop.ConsoleKit',
'/org/freedesktop/ConsoleKit/Manager'); '/org/freedesktop/ConsoleKit/Manager');
this._upClient = new UPowerGlib.Client();
}, },
// Having this function is a bit of a hack since the Systemd and ConsoleKit // Having this function is a bit of a hack since the Systemd and ConsoleKit
@ -186,10 +184,7 @@ const LoginManagerConsoleKit = new Lang.Class({
}, },
canSuspend: function(asyncCallback) { canSuspend: function(asyncCallback) {
Mainloop.idle_add(Lang.bind(this, function() {
asyncCallback(this._upClient.get_can_suspend());
return false; return false;
}));
}, },
powerOff: function() { powerOff: function() {
@ -201,6 +196,5 @@ const LoginManagerConsoleKit = new Lang.Class({
}, },
suspend: function() { suspend: function() {
this._upClient.suspend_sync(null);
} }
}); });