Fix sugar-ui-check. Load activities from system path.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/jarabe/config.py.in b/src/jarabe/config.py.in
index 9ae2394..6c418e9 100644
--- a/src/jarabe/config.py.in
+++ b/src/jarabe/config.py.in
@@ -21,5 +21,6 @@ data_path = '@prefix@/share/sugar/data'
 shell_path = '@prefix@/share/sugar/shell'
 locale_path = '@prefix@/share/locale'
 ext_path = '@prefix@/share/sugar/extensions'
+activities_path = "@prefix@/share/sugar/activities"
 version = '@SUCROSE_VERSION@'
 
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 5be1cf0..5599b81 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -46,7 +46,8 @@ class BundleRegistry(gobject.GObject):
         self._mime_defaults = self._load_mime_defaults()
 
         self._bundles = []
-        for activity_dir in self._get_activity_directories():
+        user_path = env.get_user_activities_path()
+        for activity_dir in [user_path, config.activities_path]:
             self._scan_directory(activity_dir)
 
         self._last_defaults_mtime = -1
@@ -60,15 +61,6 @@ class BundleRegistry(gobject.GObject):
 
         self._merge_default_favorites()
 
-    def _get_activity_directories(self):
-        directories = []
-        if os.environ.has_key('SUGAR_ACTIVITIES'):
-            directories.extend(os.environ['SUGAR_ACTIVITIES'].split(':'))
-
-        directories.append(env.get_user_activities_path())
-
-        return directories
-
     def _load_mime_defaults(self):
         defaults = {}