diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-11-05 02:33:49 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-11-05 02:33:49 (GMT) |
| commit | 984035f933733cba2023a014e9874f40067b93bc (patch) | |
| tree | d71813d416567eb6b10717fcd042250c4d4847ae /sugar | |
| parent | 6d84d886e190264062eab75dfc2c96633944f351 (diff) | |
Revert "Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain!"
This reverts commit 6d84d886e190264062eab75dfc2c96633944f351.
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/__installed__.py.in | 3 | ||||
| -rw-r--r-- | sugar/__uninstalled__.py | 1 | ||||
| -rw-r--r-- | sugar/env.py | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index e1fdcfc..832fca5 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -3,6 +3,5 @@ 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 = None -sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed.conf' +sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index 121e050..e0bfc29 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,5 +9,4 @@ 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 209f346..3f958b2 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,9 +54,6 @@ 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 |