diff options
| author | James Cameron <quozl@laptop.org> | 2010-08-18 22:43:33 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-01 16:55:28 (GMT) |
| commit | 90a6cf0ad7bda2d81b4fc21e306e2409a0d2adf9 (patch) | |
| tree | 0d509b182f10148629373141fe2e8248b15d131c | |
| parent | 35c9ca481380916393e29a071ca34b24f4230351 (diff) | |
revert earlier fix to #1206 and use gconf
| -rw-r--r-- | data/sugar.schemas.in | 12 | ||||
| -rw-r--r-- | src/jarabe/view/buddymenu.py | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in index 548b9fa..a0104e7 100644 --- a/data/sugar.schemas.in +++ b/data/sugar.schemas.in @@ -192,6 +192,18 @@ </schema> <schema> + <key>/schemas/desktop/sugar/show_restart</key> + <applyto>/desktop/sugar/show_restart</applyto> + <owner>sugar</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Show Restart</short> + <long>If TRUE, Sugar will show a "Restart" option.</long> + </locale> + </schema> + + <schema> <key>/schemas/desktop/sugar/peripherals/keyboard/layouts</key> <applyto>/desktop/sugar/peripherals/keyboard/layouts</applyto> <owner>sugar</owner> diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index 4637751..5592eee 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -86,6 +86,12 @@ class BuddyMenu(Palette): client = gconf.client_get_default() + if client.get_bool('/desktop/sugar/show_restart'): + item = MenuItem(_('Restart'), 'system-restart') + item.connect('activate', self.__reboot_activate_cb) + self.menu.append(item) + item.show() + if client.get_bool('/desktop/sugar/show_logout'): item = MenuItem(_('Logout'), 'system-logout') item.connect('activate', self.__logout_activate_cb) |