diff options
Diffstat (limited to 'src/jarabe/model/session.py')
-rw-r--r-- | src/jarabe/model/session.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index caf675d..121db28 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -48,16 +48,16 @@ class SessionManager(session.SessionManager): self.initiate_shutdown() def shutdown_completed(self): - bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.Hal', - '/org/freedesktop/Hal/devices/computer') - pm = dbus.Interface(proxy, \ - 'org.freedesktop.Hal.Device.SystemPowerManagement') - if env.is_emulator(): self._close_emulator() - else: + elif self._logout_mode != self.MODE_LOGOUT: try: + bus = dbus.SystemBus() + proxy = bus.get_object('org.freedesktop.Hal', + '/org/freedesktop/Hal/devices/computer') + pm = dbus.Interface(proxy, \ + 'org.freedesktop.Hal.Device.SystemPowerManagement') + if self._logout_mode == self.MODE_SHUTDOWN: pm.Shutdown() elif self._logout_mode == self.MODE_REBOOT: |