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-emulator | |
| parent | d67afd1a798ecb723fa9927fd78c9f5ae286bc69 (diff) | |
| parent | 4b328c84176fb9142112600d80c55a81e529176d (diff) | |
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'sugar-emulator')
| -rwxr-xr-x | sugar-emulator | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sugar-emulator b/sugar-emulator index d8d1d63..a26f0f2 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -79,6 +79,9 @@ 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) + '--config-file=%s' % dbus_config, program) |