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

10 files changed, 3 insertions, 70 deletions

diff --git a/.gitignore b/.gitignore
index edc5592..4f204b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ missing
 py-compile
 stamp-h1
 dbus-installed.conf
-dbus-installed-094.conf
 intltool-extract
 intltool-extract.in
 intltool-merge
diff --git a/Makefile.am b/Makefile.am
index 58822d0..adb34ab 100644
--- a/Makefile.am
+++ b/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 dbus-installed-094.conf
+dbusconf_DATA = dbus-installed.conf
 
 bin_SCRIPTS = 			\
 	sugar-emulator		\
diff --git a/configure.ac b/configure.ac
index e96a4ff..8fdef06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,6 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 dbus-installed.conf
-dbus-installed-094.conf
 activities/Makefile
 activities/web/Makefile
 activities/chat/Makefile
diff --git a/dbus-installed-094.conf.in b/dbus-installed-094.conf.in
deleted file mode 100644
index 7b6d607..0000000
--- a/dbus-installed-094.conf.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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>
diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf
deleted file mode 100644
index fbed2d6..0000000
--- a/dbus-uninstalled-094.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- 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>
diff --git a/sugar-emulator b/sugar-emulator
index a26f0f2..a45f73e 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -76,12 +76,7 @@ for i in range(1, len(sys.argv)):
 emulator = Emulator(fullscreen)
 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()
+dbus_config = env.get_dbus_config()
 
 os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
 		  '--config-file=%s' % dbus_config, program)
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 78489f4..832fca5 100644
--- a/sugar/__installed__.py.in
+++ b/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'
diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py
index 121e050..e0bfc29 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/activity/bundleregistry.py b/sugar/activity/bundleregistry.py
index c6d0531..182bfcf 100644
--- a/sugar/activity/bundleregistry.py
+++ b/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)
 
diff --git a/sugar/env.py b/sugar/env.py
index 0c996b4..e48b72a 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