Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Garg <ajay@activitycentral.com>2012-10-18 12:37:34 (GMT)
committer Ajay Garg <ajay@activitycentral.com>2012-10-18 12:42:16 (GMT)
commita5a82d06ccdeaaa77189eb94aa97dcae218f617f (patch)
treec2a50d47b02458b8fd610ccccdb2656650323234
parentb007300f395f60d074873e71a11dfe99ffd1b01a (diff)
Make "Register with School Server" gconf-controllable.
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
-rw-r--r--data/sugar.schemas.in12
-rw-r--r--src/jarabe/desktop/favoritesview.py10
2 files changed, 20 insertions, 2 deletions
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index 579d24b..82d2565 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -204,6 +204,18 @@
</schema>
<schema>
+ <key>/schemas/desktop/sugar/show_register</key>
+ <applyto>/desktop/sugar/show_register</applyto>
+ <owner>sugar</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Show Register</short>
+ <long>If TRUE, Sugar will show a "Register" 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/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 6ef4d15..37a5fdc 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -667,6 +667,14 @@ class OwnerIcon(BuddyIcon):
palette = BuddyMenu(get_owner_instance())
client = GConf.Client.get_default()
+ show_register = client.get_bool('/desktop/sugar/show_register')
+
+ if show_register:
+ self._create_register_menu(palette, client)
+
+ return palette
+
+ def _create_register_menu(self, palette, client):
backup_url = client.get_string('/desktop/sugar/backup_url')
if not backup_url:
@@ -679,8 +687,6 @@ class OwnerIcon(BuddyIcon):
palette.menu.append(self._register_menu)
self._register_menu.show()
- return palette
-
def __register_activate_cb(self, menuitem):
self.emit('register-activate')