Get rid of dbus 0.94 compatibility, since we build dbus in jhbuild now. Yay!

sugar/__installed__.py.in

@@ -4,5 +4,4 @@ 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,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')

sugar/activity/bundleregistry.py

@@ -10,11 +10,7 @@ class _ServiceParser(ConfigParser):
 
 class _ServiceManager(object):
 	def __init__(self):
-		if env.get_dbus_version() < '0.95':
-			self._path = '/tmp/sugar-services'
-		else:
-			self._path = os.path.expanduser('~/.local/share/dbus-1/services')
-
+		self._path = os.path.expanduser('~/.local/share/dbus-1/services')
 		if not os.path.isdir(self._path):
 			os.makedirs(self._path)
 

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