Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts: NEWS
2007-09-24 21:08:26 +02:00
parent 90bf68d0f3 e3f97b042f
commit 9b68754ba5
4 changed files with 30 additions and 0 deletions
@@ -24,6 +24,7 @@ import gtk
 import hippo
 import dbus

+from hardware import hardwaremanager
 from sugar.graphics import style
 from sugar.graphics.xocolor import XoColor
 from sugar.graphics.palette import Palette, CanvasInvoker
@@ -167,6 +168,9 @@ class _MyIcon(MyIcon):

        pm = self._get_power_manager()

+        hw_manager = hardwaremanager.get_manager()
+        hw_manager.shutdown()
+
        if env.is_emulator():
            self._close_emulator()
        else:
@@ -178,6 +182,9 @@ class _MyIcon(MyIcon):

        pm = self._get_power_manager()

+        hw_manager = hardwaremanager.get_manager()
+        hw_manager.shutdown()
+
        if env.is_emulator():
            self._close_emulator()
        else: