Revert "Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain!"

This reverts commit 6d84d886e1.
This commit is contained in:
Marco Pesenti Gritti
2006-11-05 03:33:49 +01:00
parent 6d84d886e1
commit 984035f933
9 changed files with 8 additions and 43 deletions
+2 -8
View File
@@ -73,12 +73,6 @@ emulator.start()
if env.get_dbus_version() < '0.95':
if not os.path.isdir('/tmp/sugar-services'):
os.mkdir('/tmp/sugar-services')
dbus_config = env.get_dbus_config_094()
else:
dbus_config = env.get_dbus_config()
if dbus_config:
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
'--config-file=%s' % dbus_config, program)
else:
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
'--config-file=%s' % env.get_dbus_config(), program)