From a5a82d06ccdeaaa77189eb94aa97dcae218f617f Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@activitycentral.com>
Date: Thu, 18 Oct 2012 12:37:34 +0000
Subject: Make "Register with School Server" gconf-controllable.

Signed-off-by: Ajay Garg <ajay@activitycentral.com>
---
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')
 
--
cgit v0.9.1