diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
commit | 9b68754ba5c1f63d7ca6adfee3ef6114628c175e (patch) | |
tree | 351767f819241965d51f7d5aeb600d3226c12bee /shell/view/home/HomeBox.py | |
parent | 90bf68d0f3a7f96561dfe22c46721db585f4bdc9 (diff) | |
parent | e3f97b042f2ffddcef8d10ae6d9bd3cb4f6c19c1 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'shell/view/home/HomeBox.py')
-rw-r--r-- | shell/view/home/HomeBox.py | 7 |
1 files changed, 7 insertions, 0 deletions
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: |