From b91d9c2867952520e685d689f75bc019befcaaf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 3 Feb 2013 21:53:33 +0100 Subject: [PATCH] loginManager: Make suspend() a NOP in the ConsoleKit path 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 --- js/misc/loginManager.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js index d1c7bd9bf..fd10c6853 100644 --- a/js/misc/loginManager.js +++ b/js/misc/loginManager.js @@ -5,7 +5,6 @@ const Gio = imports.gi.Gio; const Lang = imports.lang; const Mainloop = imports.mainloop; const Shell = imports.gi.Shell; -const UPowerGlib = imports.gi.UPowerGlib; const SystemdLoginManagerIface = @@ -150,7 +149,6 @@ const LoginManagerConsoleKit = new Lang.Class({ this._proxy = new ConsoleKitManager(Gio.DBus.system, 'org.freedesktop.ConsoleKit', '/org/freedesktop/ConsoleKit/Manager'); - this._upClient = new UPowerGlib.Client(); }, // 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) { - Mainloop.idle_add(Lang.bind(this, function() { - asyncCallback(this._upClient.get_can_suspend()); - return false; - })); + return false; }, powerOff: function() { @@ -201,6 +196,5 @@ const LoginManagerConsoleKit = new Lang.Class({ }, suspend: function() { - this._upClient.suspend_sync(null); } });