diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-11-05 02:25:51 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-11-05 02:25:51 (GMT) |
| commit | 6d84d886e190264062eab75dfc2c96633944f351 (patch) | |
| tree | 55d666e8caf8dacfe787caca90740b000127d9a8 /sugar-emulator | |
| parent | 137b8ddd230154208f0e05e24da126bfc39a5d3d (diff) | |
Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain!
Diffstat (limited to 'sugar-emulator')
| -rwxr-xr-x | sugar-emulator | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sugar-emulator b/sugar-emulator index e9ba62c..11e606f 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -73,6 +73,12 @@ 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() -os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', - '--config-file=%s' % env.get_dbus_config(), program) +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) |