Get rid of our custom dbus config, simplify stuff

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()

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