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-emulator | |
| 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-emulator')
| -rwxr-xr-x | sugar-emulator | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sugar-emulator b/sugar-emulator index 11e606f..e9ba62c 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -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) |