From c19e92c91bb55740069db635b44ffd58f08331dd Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Thu, 19 Aug 2010 08:43:33 +1000
Subject: [PATCH] revert earlier fix to #1206 and use gconf
---
data/sugar.schemas.in | 12 ++++++++++++
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 2e6b820..d9a3954 100644
a
|
b
|
|
192 | 192 | </schema> |
193 | 193 | |
194 | 194 | <schema> |
| 195 | <key>/schemas/desktop/sugar/show_restart</key> |
| 196 | <applyto>/desktop/sugar/show_restart</applyto> |
| 197 | <owner>sugar</owner> |
| 198 | <type>bool</type> |
| 199 | <default>true</default> |
| 200 | <locale name="C"> |
| 201 | <short>Show Restart</short> |
| 202 | <long>If TRUE, Sugar will show a "Restart" option.</long> |
| 203 | </locale> |
| 204 | </schema> |
| 205 | |
| 206 | <schema> |
195 | 207 | <key>/schemas/desktop/sugar/peripherals/keyboard/layouts</key> |
196 | 208 | <applyto>/desktop/sugar/peripherals/keyboard/layouts</applyto> |
197 | 209 | <owner>sugar</owner> |
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 4637751..5592eee 100644
a
|
b
|
class BuddyMenu(Palette): |
86 | 86 | |
87 | 87 | client = gconf.client_get_default() |
88 | 88 | |
| 89 | if client.get_bool('/desktop/sugar/show_restart'): |
| 90 | item = MenuItem(_('Restart'), 'system-restart') |
| 91 | item.connect('activate', self.__reboot_activate_cb) |
| 92 | self.menu.append(item) |
| 93 | item.show() |
| 94 | |
89 | 95 | if client.get_bool('/desktop/sugar/show_logout'): |
90 | 96 | item = MenuItem(_('Logout'), 'system-logout') |
91 | 97 | item.connect('activate', self.__logout_activate_cb) |