Less invasive solution for the reverted commit

.gitignore

@@ -25,6 +25,7 @@ missing
 py-compile
 stamp-h1
 dbus-installed.conf
+dbus-installed-094.conf
 intltool-extract
 intltool-extract.in
 intltool-merge

Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = activities lib po shell sugar services tools
 ACLOCAL_AMFLAGS = -I m4
 
 dbusconfdir = $(pkgdatadir)
-dbusconf_DATA = dbus-installed.conf
+dbusconf_DATA = dbus-installed.conf dbus-installed-094.conf
 
 bin_SCRIPTS = 			\
 	sugar-emulator		\

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.47],[],[sugar])
+AC_INIT([Sugar],[0.48],[],[sugar])
 
 AC_PREREQ([2.59])
 
@@ -51,6 +51,7 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 dbus-installed.conf
+dbus-installed-094.conf
 activities/Makefile
 activities/web/Makefile
 activities/chat/Makefile

dbus-installed-094.conf.in

@@ -0,0 +1,26 @@
+<!-- This configuration file controls the per-user-login-session message bus.
+     Add a session-local.conf and edit that rather than changing this 
+     file directly. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <servicedir>@prefix@/share/sugar/activities</servicedir>
+  <servicedir>@prefix@/share/sugar/services</servicedir>
+  <servicedir>/tmp/sugar-services</servicedir>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+</busconfig>

dbus-installed.conf.in

@@ -10,6 +10,7 @@
 
   <listen>unix:tmpdir=/tmp</listen>
 
+  <standard_session_servicedirs />
   <servicedir>@prefix@/share/sugar/activities</servicedir>
   <servicedir>@prefix@/share/sugar/services</servicedir>
   <servicedir>/tmp/sugar-services</servicedir>

dbus-uninstalled-094.conf

@@ -0,0 +1,25 @@
+<!-- This configuration file controls the per-user-login-session message bus.
+     Add a session-local.conf and edit that rather than changing this 
+     file directly. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <servicedir>/tmp/sugar</servicedir>
+  <servicedir>/tmp/sugar-services</servicedir>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+</busconfig>

dbus-uninstalled.conf

@@ -10,6 +10,7 @@
 
   <listen>unix:tmpdir=/tmp</listen>
 
+  <standard_session_servicedirs />
   <servicedir>/tmp/sugar</servicedir>
   <servicedir>/tmp/sugar-services</servicedir>
 

sugar-emulator

@@ -73,6 +73,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)

sugar/__installed__.py.in

@@ -4,4 +4,5 @@ sugar_activities_dir = '@prefix@/share/sugar/activities'
 sugar_activity_info_dir = '@prefix@/share/sugar/activities'
 sugar_services_dir = '@prefix@/share/sugar/services'
 sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
+sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed-094.conf'
 sugar_shell_bin_dir = '@prefix@/bin'

sugar/__uninstalled__.py

@@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services')
 sugar_activity_info_dir = _tmpdir
 sugar_activities_dir = os.path.join(_sourcedir, 'activities')
 sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf')
+sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf')
 sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell')

sugar/env.py

@@ -54,6 +54,9 @@ def get_services_dir():
 def get_dbus_config():
 	return sugar_dbus_config
 
+def get_dbus_config_094():
+	return sugar_dbus_config_094
+
 def get_shell_bin_dir():
 	return sugar_shell_bin_dir