From 2ad31b35d1f5729fb14fb515529a8f3c1227cf42 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Sun, 05 Nov 2006 09:52:11 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/sugar

---
(limited to 'sugar-emulator')

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)
--
cgit v0.9.1