diff --git a/Makefile.am b/Makefile.am
index 4ef729a5..ac05c5d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,23 +2,10 @@ SUBDIRS = lib po shell sugar services tools
ACLOCAL_AMFLAGS = -I m4
-dbusconfdir = $(pkgdatadir)
-dbusconf_DATA = dbus-installed.conf
-
bin_SCRIPTS = \
sugar-emulator \
sugar-emulator-shutdown
-install-data-local:
- $(top_srcdir)/sugar/setup.py \
- $(top_srcdir)/activities \
- $(DESTDIR)$(pkgdatadir)/activities \
- $(bindir)/sugar-activity-factory
-
-uninstall-local:
- rm -rf $(DESTDIR)$(pkgdatadir)/activities/*.activity
- rm -rf $(DESTDIR)$(pkgdatadir)/activities/*.service
-
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
diff --git a/configure.ac b/configure.ac
index efca19c0..fd90569e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,6 @@ AM_GLIB_GNU_GETTEXT
AC_OUTPUT([
Makefile
-dbus-installed.conf
lib/Makefile
lib/data/Makefile
lib/src/Makefile
diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in
deleted file mode 100644
index 4e811975..00000000
--- a/dbus-installed.conf.in
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
- session
-
- unix:tmpdir=/tmp
-
-
- @prefix@/share/sugar/activities
- @prefix@/share/sugar/services
- /tmp/sugar-services
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf
deleted file mode 100644
index ed3dc741..00000000
--- a/dbus-uninstalled.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- session
-
- unix:tmpdir=/tmp
-
-
- /tmp/sugar
- /tmp/sugar-services
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sugar-emulator b/sugar-emulator
index a45f73e2..6def3c1f 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -48,19 +48,15 @@ if sourcedir:
else:
os.environ['PATH'] = bin_path
- source = os.path.join(sourcedir, 'activities')
- runner = os.path.join(sourcedir, 'shell/sugar-activity-factory')
- setup.setup_activities(source, env.get_activity_info_dir(), runner)
-
bin = os.path.join(sourcedir,
'services/presence/sugar-presence-service')
setup.write_service('org.laptop.Presence', bin,
- env.get_activity_info_dir())
+ env.get_user_service_dir())
bin = os.path.join(sourcedir,
'services/clipboard/sugar-clipboard')
setup.write_service('org.laptop.Clipboard', bin,
- env.get_activity_info_dir())
+ env.get_user_service_dir())
from sugar.emulator import Emulator
@@ -76,7 +72,4 @@ for i in range(1, len(sys.argv)):
emulator = Emulator(fullscreen)
emulator.start()
-dbus_config = env.get_dbus_config()
-
-os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
- '--config-file=%s' % dbus_config, program)
+os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)
diff --git a/sugar/activity/bundleregistry.py b/sugar/activity/bundleregistry.py
index 182bfcf5..02bf3021 100644
--- a/sugar/activity/bundleregistry.py
+++ b/sugar/activity/bundleregistry.py
@@ -10,9 +10,7 @@ class _ServiceParser(ConfigParser):
class _ServiceManager(object):
def __init__(self):
- self._path = os.path.expanduser('~/.local/share/dbus-1/services')
- if not os.path.isdir(self._path):
- os.makedirs(self._path)
+ self._path = env.get_user_service_dir()
def add(self, bundle):
name = bundle.get_service_name()
diff --git a/sugar/env.py b/sugar/env.py
index 46c4ed7e..24ac69d2 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -51,9 +51,6 @@ def get_activity_info_dir():
def get_services_dir():
return sugar_services_dir
-def get_dbus_config():
- return sugar_dbus_config
-
def get_shell_bin_dir():
return sugar_shell_bin_dir
@@ -63,3 +60,9 @@ def get_data_dirs():
return os.environ['XDG_DATA_DIRS'].split(':')
else:
return [ '/usr/local/share/', '/usr/share/' ]
+
+def get_user_service_dir():
+ service_dir = os.path.expanduser('~/.local/share/dbus-1/services')
+ if not os.path.isdir(service_dir):
+ os.makedirs(service_dir)
+ return service_dir