Do not start accessibility bus if at-spi-corba is enabled

diff --git a/bus/at-spi-dbus-bus.in b/bus/at-spi-dbus-bus.in
index de10d8a..86b676b 100644 (file)
--- a/bus/at-spi-dbus-bus.in
+++ b/bus/at-spi-dbus-bus.in
@@ -3,6 +3,19 @@
 prefix="@prefix@"
 sysconfdir="@sysconfdir@"
 dbusdaemon="@DBUS_DAEMON@"
+relocate=@enable_relocate@
+
+if [ "$relocate" == "yes" ]; then
+  var=`gconftool-2 --get /desktop/gnome/interface/at-spi-dbus`
+  if [ "$var" == "false" ]; then
+    exit 0
+  fi
+else
+  var=`gconftool-2 --get /desktop/gnome/interface/at-spi-corba`
+  if [ "$var" == "true" ]; then
+    exit 0
+  fi
+fi
 
 address=`${dbusdaemon} --config-file=${sysconfdir}/at-spi2/accessibility.conf --print-address`
 xprop -root -f AT_SPI_BUS 8s -set AT_SPI_BUS ${address}

diff --git a/configure.ac b/configure.ac
index f633ad5..8276a47 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -171,10 +171,12 @@ if test x$enable_relocate = xyes ; then
        AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
 fi
 AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+AC_SUBST(enable_relocate)
 
 AC_CONFIG_FILES([Makefile
        xml/Makefile
        registryd/Makefile
+       bus/at-spi-dbus-bus
        bus/Makefile])
 
 AC_OUTPUT