diff options
| -rw-r--r-- | shell/conf/ActivityRegistry.py | 2 | ||||
| -rwxr-xr-x | shell/sugar-activity | 3 | ||||
| -rw-r--r-- | sugar/__installed__.py.in | 1 | ||||
| -rw-r--r-- | sugar/__uninstalled__.py.in | 2 | ||||
| -rw-r--r-- | sugar/env.py | 7 |
5 files changed, 11 insertions, 4 deletions
diff --git a/shell/conf/ActivityRegistry.py b/shell/conf/ActivityRegistry.py index 64173a9..5899f34 100644 --- a/shell/conf/ActivityRegistry.py +++ b/shell/conf/ActivityRegistry.py @@ -74,7 +74,7 @@ class _ActivityRegistry: def __init__(self): self._activities = [] - self.scan_directory(env.get_activities_dir()) + self.scan_directory(env.get_activity_info_dir()) def get_activity(self, activity_id): """Returns an activity given his identifier""" diff --git a/shell/sugar-activity b/shell/sugar-activity index 4782d94..8e4b149 100755 --- a/shell/sugar-activity +++ b/shell/sugar-activity @@ -17,6 +17,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import sys +import os + +sys.path.insert(0, env.get_activities_dir()) from sugar.activity import ActivityFactory diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index d9cdfd5..3378d89 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -1,6 +1,7 @@ sugar_source_dir = None sugar_data_dir = '@prefix@/share/sugar' sugar_activities_dir = '@prefix@/share/sugar/activities' +sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in index b63af66..4170d57 100644 --- a/sugar/__uninstalled__.py.in +++ b/sugar/__uninstalled__.py.in @@ -6,7 +6,7 @@ sugar_data_dir = os.path.join(sugar_source_dir, 'shell/data') sugar_services_dir = os.path.join(sugar_source_dir, 'services') __tmpdir = os.path.join(tempfile.gettempdir(), 'sugar') -sugar_activities_dir = __tmpdir +sugar_activity_info_dir = __tmpdir sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf') diff --git a/sugar/env.py b/sugar/env.py index bd7a919..8fe2a75 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -47,12 +47,12 @@ def setup_system(): if sugar_source_dir: source = os.path.join(sugar_source_dir, 'activities') runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory') - sugar.setup.setup_activities(source, sugar_activities_dir, runner) + sugar.setup.setup_activities(source, get_activity_info_dir(), runner) bin = os.path.join(sugar_source_dir, 'services/presence/sugar-presence-service') sugar.setup.write_service('org.laptop.Presence', bin, - sugar_activities_dir) + get_activity_info_dir()) def get_profile_path(): if os.environ.has_key('SUGAR_PROFILE'): @@ -75,6 +75,9 @@ def get_data_dir(): def get_activities_dir(): return sugar_activities_dir +def get_activity_info_dir(): + return sugar_activity_info_dir + def get_services_dir(): return sugar_services_dir |