From 9a7518f23076d824aefa5cc764af65b639cb7e1d Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 16 Nov 2006 10:07:30 +0000
Subject: Get rid of dbus 0.94 compatibility, since we build dbus in jhbuild now. Yay!

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

diff --git a/sugar-emulator b/sugar-emulator
index a26f0f2..a45f73e 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -76,12 +76,7 @@ for i in range(1, len(sys.argv)):
 emulator = Emulator(fullscreen)
 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()
+dbus_config = env.get_dbus_config()
 
 os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
 		  '--config-file=%s' % dbus_config, program)
--
cgit v0.9.1