diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory index 4f4ba0d7..6065ba31 100755 --- a/shell/sugar-activity-factory +++ b/shell/sugar-activity-factory @@ -32,9 +32,6 @@ dbus.glib.threads_init() from sugar import logger from sugar import env - -sys.path.insert(0, env.get_activities_dir()) - from sugar.activity import ActivityFactory logger.start(sys.argv[1]) diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index b2917ce9..7dc2f384 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -1,11 +1,7 @@ import os -import tempfile -_tmpdir = os.path.join(tempfile.gettempdir(), 'sugar') _sourcedir = os.path.dirname(os.path.dirname(__file__)) sugar_data_dir = os.path.join(_sourcedir, 'shell/data') sugar_services_dir = os.path.join(_sourcedir, 'services') -sugar_activity_info_dir = _tmpdir -sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') diff --git a/sugar/env.py b/sugar/env.py index 24ac69d2..7c637312 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -42,12 +42,6 @@ def get_profile_path(): def get_data_dir(): return sugar_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