Uncomment emulator shutdown. Quit the shell even when

rebooting. #7566

1 files changed, 6 insertions, 5 deletions

diff --git a/src/session.py b/src/session.py
index f0f7b8e..1594fb5 100644
--- a/src/session.py
+++ b/src/session.py
@@ -48,6 +48,8 @@ class SessionManager(session.SessionManager):
         self.initiate_shutdown()
 
     def shutdown_completed(self):
+        session.SessionManager.shutdown_completed(self)
+
         hw_manager = hardwaremanager.get_manager()
         hw_manager.shutdown()
 
@@ -58,16 +60,15 @@ class SessionManager(session.SessionManager):
                             'org.freedesktop.Hal.Device.SystemPowerManagement') 
 
         if env.is_emulator():
-            pass
-            #self._close_emulator()
+            self._close_emulator()
         else:
-            if self._logout_mode == self.MODE_LOGOUT:
-                gtk.main_quit()
-            elif self._logout_mode == self.MODE_SHUTDOWN:
+            if self._logout_mode == self.MODE_SHUTDOWN:
                 pm.Shutdown()
             elif self._logout_mode == self.MODE_REBOOT:
                 pm.Reboot()
 
+            gtk.main_quit()
+
     def _close_emulator(self):
         if os.environ.has_key('SUGAR_EMULATOR_PID'):
             pid = int(os.environ['SUGAR_EMULATOR_PID'])