Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar-emulator
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2006-11-03 07:39:21 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2006-11-03 07:39:21 (GMT)
commitc7dbfdb067d200903fe6805ab59ed6b7129b129a (patch)
treee9b53bacf279078afb4c202a92e2a60a3516b89c /sugar-emulator
parenta6503b8bd8092112323f06c5ab29337a01753597 (diff)
parent561169809b92e29cfd762c3cd673def881764dcc (diff)
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'sugar-emulator')
-rwxr-xr-xsugar-emulator6
1 files changed, 3 insertions, 3 deletions
diff --git a/sugar-emulator b/sugar-emulator
index a042618..d8d1d63 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -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)