From 8ba9b493d986e3378a45103f71c3c9dfd15649fc Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Fri, 30 Nov 2012 14:43:36 +0000
Subject: Start fixing bundle registry

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
---
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index da8bb65..ff29433 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -544,18 +544,18 @@ class ActivityListPalette(ActivityPalette):
         self._favorite_item.set_image(self._favorite_icon)
         self._favorite_item.connect('activate',
                                     self.__change_favorite_activate_cb)
-#        self.menu.append(self._favorite_item)
+        self.menu.append(self._favorite_item)
         self._favorite_item.show()
 
         if activity_info.is_user_activity():
-            pass  # self._add_erase_option(registry, activity_info)
+            self._add_erase_option(registry, activity_info)
 
         registry = bundleregistry.get_registry()
         self._activity_changed_sid = registry.connect('bundle_changed',
                 self.__activity_changed_cb)
         self._update_favorite_item()
 
-        #self.menu.connect('destroy', self.__destroy_cb)
+        self.menu.connect('destroy', self.__destroy_cb)
 
     def _add_erase_option(self, registry, activity_info):
         menu_item = MenuItem(_('Erase'), 'list-remove')
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index ee680f0..f07c096 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -92,8 +92,13 @@ class BundleRegistry(GObject.GObject):
             self._load_favorites()
         except Exception:
             logging.exception('Error while loading favorite_activities.')
+        try:
+            self._load_school()
+        except Exception:
+            logging.exception('Error while loading school_activities.')
 
         self._merge_default_favorites()
+        self._merge_default_school()
 
     def __file_monitor_changed_cb(self, monitor, one_file, other_file,
                                   event_type):
@@ -148,6 +153,7 @@ class BundleRegistry(GObject.GObject):
             self._last_defaults_mtime = float(favorites_data['defaults-mtime'])
             self._favorite_bundles = favorite_bundles
 
+    def _load_school(self):
         school_path = env.get_profile_path('school_activities')
         if os.path.exists(school_path):
             school_data = simplejson.load(open(school_path))
@@ -168,7 +174,6 @@ class BundleRegistry(GObject.GObject):
             self._last_school_defaults_mtime = float(school_data['defaults-mtime'])
             self._school_bundles = school_bundles
 
-
     def _merge_default_favorites(self):
         default_activities = []
         defaults_path = os.path.join(config.data_path, 'activities.defaults')
@@ -203,6 +208,7 @@ class BundleRegistry(GObject.GObject):
 
         self._write_favorites_file()
 
+    def _merge_default_school(self):
         default_school_activities = []
         defaults_school_path = os.path.join(config.data_path, 'schoolactivities.defaults')
         if os.path.exists(defaults_school_path):
@@ -456,7 +462,7 @@ class BundleRegistry(GObject.GObject):
     def _write_school_file(self):
         path = env.get_profile_path('school_activities')
         school_data = {'defaults-mtime': self._last_school_defaults_mtime,
-                          'school': self._favorite_bundles}
+                          'school': self._school_bundles}
         simplejson.dump(school_data, open(path, 'w'), indent=1)
 
     def is_installed(self, bundle):
--
cgit v0.9.1