diff --git a/Makefile.am b/Makefile.am
index d66d590a..adb34ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ bin_SCRIPTS = \
install-data-local:
$(top_srcdir)/sugar/setup.py \
$(top_srcdir)/activities \
- $(DESTDIR)$(datadir)/dbus-1/services \
+ $(DESTDIR)$(pkgdatadir)/activities \
$(bindir)/sugar-activity-factory
uninstall-local:
diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in
index ca0c208c..7b6d6074 100644
--- a/dbus-installed.conf.in
+++ b/dbus-installed.conf.in
@@ -10,7 +10,8 @@
unix:tmpdir=/tmp
- @prefix@/share/dbus-1/services
+ @prefix@/share/sugar/activities
+ @prefix@/share/sugar/services
/tmp/sugar-services
diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf
deleted file mode 100644
index fbed2d6a..00000000
--- a/dbus-uninstalled-094.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- session
-
- unix:tmpdir=/tmp
-
- /tmp/sugar
- /tmp/sugar-services
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf
index fa4e6f2f..fbed2d6a 100644
--- a/dbus-uninstalled.conf
+++ b/dbus-uninstalled.conf
@@ -10,8 +10,8 @@
unix:tmpdir=/tmp
-
/tmp/sugar
+ /tmp/sugar-services
diff --git a/services/presence/Makefile.am b/services/presence/Makefile.am
index 9b40ed3d..f64bc02f 100644
--- a/services/presence/Makefile.am
+++ b/services/presence/Makefile.am
@@ -1,4 +1,4 @@
-servicedir = $(datadir)/dbus-1/services
+servicedir = $(datadir)/sugar/services
service_in_files = org.laptop.Presence.service.in
service_DATA = $(service_in_files:.service.in=.service)
diff --git a/sugar-emulator b/sugar-emulator
index 11e606fb..e9ba62c3 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -73,12 +73,6 @@ 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()
-if dbus_config:
- os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
- '--config-file=%s' % dbus_config, program)
-else:
- os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)
+os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
+ '--config-file=%s' % env.get_dbus_config(), program)
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index e1fdcfc3..832fca50 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -3,6 +3,5 @@ sugar_data_dir = '@prefix@/share/sugar'
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 = None
-sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed.conf'
+sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
sugar_shell_bin_dir = '@prefix@/bin'
diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py
index 121e0508..e0bfc295 100644
--- a/sugar/__uninstalled__.py
+++ b/sugar/__uninstalled__.py
@@ -9,5 +9,4 @@ 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')
diff --git a/sugar/env.py b/sugar/env.py
index 209f3460..3f958b23 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -54,9 +54,6 @@ 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