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

2006-11-03 08:39:21 +01:00
parent a6503b8bd8 561169809b
commit c7dbfdb067
4 changed files with 21 additions and 5 deletions
@@ -76,9 +76,9 @@ for i in range(1, len(sys.argv)):
 emulator = Emulator(fullscreen)
 emulator.start()

-# FIXME temporary until dbus support services in home dir
-if not os.path.isdir('/tmp/sugar-services'):
-	os.mkdir('/tmp/sugar-services')
+if env.get_dbus_version() < '0.95':
+	if not os.path.isdir('/tmp/sugar-services'):
+		os.mkdir('/tmp/sugar-services')

 os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
 		  '--config-file=%s' % env.get_dbus_config(), program)