Merge branch 'master' of git://dev.laptop.org/sugar

2006-11-05 10:52:11 +01:00
parent d67afd1a79 4b328c8417
commit 2ad31b35d1
11 changed files with 66 additions and 3 deletions
@@ -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)