diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-01-22 17:34:28 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-02-17 23:10:56 (GMT) |
| commit | fd15e619f3c95bf0b1ded1dde899a56e87a92576 (patch) | |
| tree | 37fe72cf904cc9b270789a78bf67418eb262f3c0 | |
| parent | 6ba79fcd6ca69c782d9df1f0d6ce8f70b7be202d (diff) | |
use ConsoleKit instead of HAL for shutdown/reboot
HAL [1] is dead [2], ConsoleKit [3] now handles shutdown / reboot.
Tested on XO-1.5 running Debian Squeeze with consolekit 0.4.1-4.
[1] http://www.freedesktop.org/wiki/Software/hal
[2] http://lists.freedesktop.org/archives/hal/2008-May/011560.html
[3] http://www.freedesktop.org/wiki/Software/ConsoleKit
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Tested-By: Simon Schampijer <simon@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
| -rw-r--r-- | src/jarabe/model/session.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index c6409fb..9b277ff 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -55,15 +55,15 @@ class SessionManager(session.SessionManager): elif self._logout_mode != self.MODE_LOGOUT: try: bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.Hal', - '/org/freedesktop/Hal/devices/computer') + proxy = bus.get_object('org.freedesktop.ConsoleKit', + '/org/freedesktop/ConsoleKit/Manager') pm = dbus.Interface(proxy, - 'org.freedesktop.Hal.Device.SystemPowerManagement') + 'org.freedesktop.ConsoleKit.Manager') if self._logout_mode == self.MODE_SHUTDOWN: - pm.Shutdown() + pm.Stop() elif self._logout_mode == self.MODE_REBOOT: - pm.Reboot() + pm.Restart() except: logging.exception('Can not stop sugar') self.session.cancel_shutdown() |