diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index b39ff77..dc7104d 100644
a
|
b
|
|
168 | 168 | </locale> |
169 | 169 | </schema> |
170 | 170 | |
| 171 | <schema> |
| 172 | <key>/schemas/desktop/sugar/show_logout</key> |
| 173 | <applyto>/desktop/sugar/show_logout</applyto> |
| 174 | <owner>sugar</owner> |
| 175 | <type>bool</type> |
| 176 | <default>false</default> |
| 177 | <locale name="C"> |
| 178 | <!-- FIXME: Enable these after string freeze is over |
| 179 | <short>Show Log out</short> |
| 180 | <long>If TRUE, Sugar will show a "Log out" option.</long>--> |
| 181 | </locale> |
| 182 | </schema> |
| 183 | |
171 | 184 | </schemalist> |
172 | 185 | </gconfschemafile> |
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 99cf57f..35a8301 100644
a
|
b
|
import logging |
18 | 18 | from gettext import gettext as _ |
19 | 19 | |
20 | 20 | import gtk |
| 21 | import gconf |
21 | 22 | |
22 | 23 | from sugar.graphics.palette import Palette |
23 | 24 | from sugar.graphics.menuitem import MenuItem |
… |
… |
class BuddyMenu(Palette): |
83 | 84 | self.menu.append(item) |
84 | 85 | item.show() |
85 | 86 | |
86 | | item = MenuItem(_('Logout'), 'system-logout') |
87 | | item.connect('activate', self.__logout_activate_cb) |
88 | | self.menu.append(item) |
89 | | item.show() |
| 87 | client = gconf.client_get_default() |
| 88 | |
| 89 | if client.get_bool('/desktop/sugar/show_logout'): |
| 90 | item = MenuItem(_('Logout'), 'system-logout') |
| 91 | item.connect('activate', self.__logout_activate_cb) |
| 92 | self.menu.append(item) |
| 93 | item.show() |
90 | 94 | |
91 | 95 | item = MenuItem(_('Restart'), 'system-restart') |
92 | 96 | item.connect('activate', self.__reboot_activate_cb) |