diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 07:57:00 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 07:57:00 (GMT) |
| commit | dc0de1d35d5424a042888cde90b0cc8e8e6be066 (patch) | |
| tree | 87d230c7f10b5681c77422fc9b18fb4ff6fd53b2 /sugar | |
| parent | f74614a02bcf9447404e06059306ccf544c053fb (diff) | |
Let the presence service set his own path
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/__installed__.py.in | 4 | ||||
| -rw-r--r-- | sugar/__uninstalled__.py.in | 3 | ||||
| -rw-r--r-- | sugar/env.py | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index ff0a830..d9cdfd5 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -4,6 +4,6 @@ sugar_activities_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' -sugar_python_path = ['@prefix@/share/sugar/activities', - '@prefix@/share/sugar/services'] +sugar_python_path = ['@prefix@/share/sugar/activities'] + sugar_bin_path = [] diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in index 869901d..c454a86 100644 --- a/sugar/__uninstalled__.py.in +++ b/sugar/__uninstalled__.py.in @@ -3,17 +3,16 @@ import tempfile sugar_source_dir = os.path.dirname(os.path.dirname(__file__)) 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_service_dir = __tmpdir sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf') sugar_python_path = [] sugar_python_path.append(sugar_source_dir) sugar_python_path.append(os.path.join(sugar_source_dir, 'activities')) -sugar_python_path.append(os.path.join(sugar_source_dir, 'services')) sugar_bin_path = [] sugar_bin_path.append(os.path.join(sugar_source_dir)) diff --git a/sugar/env.py b/sugar/env.py index a2dfa45..bd7a919 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -75,5 +75,8 @@ def get_data_dir(): def get_activities_dir(): return sugar_activities_dir +def get_services_dir(): + return sugar_services_dir + def get_dbus_config(): return sugar_dbus_config |