From 9b68754ba5c1f63d7ca6adfee3ef6114628c175e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 24 Sep 2007 19:08:26 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts:

	NEWS
---
(limited to 'shell/view/home/HomeBox.py')

diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py
index ddcac66..79628ba 100644
--- a/shell/view/home/HomeBox.py
+++ b/shell/view/home/HomeBox.py
@@ -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:
--
cgit v0.9.1