diff options
author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2006-11-05 09:52:11 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2006-11-05 09:52:11 (GMT) |
commit | 2ad31b35d1f5729fb14fb515529a8f3c1227cf42 (patch) | |
tree | cba65c264fb593ed06d31a65c8254f467a057346 /sugar | |
parent | d67afd1a798ecb723fa9927fd78c9f5ae286bc69 (diff) | |
parent | 4b328c84176fb9142112600d80c55a81e529176d (diff) |
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/__installed__.py.in | 1 | ||||
-rw-r--r-- | sugar/__uninstalled__.py | 1 | ||||
-rw-r--r-- | sugar/env.py | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index 832fca5..78489f4 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -4,4 +4,5 @@ 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' +sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed-094.conf' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index e0bfc29..121e050 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services') sugar_activity_info_dir = _tmpdir sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf') +sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') diff --git a/sugar/env.py b/sugar/env.py index 3f958b2..209f346 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,6 +54,9 @@ def get_services_dir(): def get_dbus_config(): return sugar_dbus_config +def get_dbus_config_094(): + return sugar_dbus_config_094 + def get_shell_bin_dir(): return sugar_shell_bin_dir |