[at-spi2-core] Limit service activation to accessibility bus

[Mike Gorse <mgorse src gnome org>]

commit 5ef30626a68a0c42cf36f414e3baf43de06e2a8d
Author: Magdalen Berns <m berns thismagpie com>
Date:   Fri Sep 26 18:17:51 2014 +0100

    Limit service activation to accessibility bus
    
    Instead of having to send a message to an activatable
    service listed in $datadir/dbus-1/services it is
    better to limit these and define an accessibility-services
    directory and list services in there explicitly
    
    Co-authored by: Mike Gorse <mgorse suse com>
    
    Bug https://bugzilla.gnome.org/show_bug.cgi?id=722738

 bus/Makefile.am        |    2 +-
 bus/accessibility.conf |    2 --
 registryd/Makefile.am  |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/bus/Makefile.am b/bus/Makefile.am
index de6ea4f..c65de94 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -20,7 +20,7 @@ at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in
 EXTRA_DIST += at-spi-dbus-bus.desktop.in
 CLEANFILES += at-spi-dbus-bus.desktop
 
-dbusservicedir=$(datadir)/dbus-1/services
+dbusservicedir=$(DBUS_SERVICES_DIR)
 dbusservice_DATA = org.a11y.Bus.service
 
 org.a11y.Bus.service: org.a11y.Bus.service.in
diff --git a/bus/accessibility.conf b/bus/accessibility.conf
index b9367d0..a5c770e 100644
--- a/bus/accessibility.conf
+++ b/bus/accessibility.conf
@@ -3,8 +3,6 @@
 
   <type>accessibility</type>
 
-  <standard_session_servicedirs/>
-
   <auth>EXTERNAL</auth>
 
   <listen>unix:tmpdir=/tmp</listen>
diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 43cb147..c9c9d39 100644
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -55,7 +55,7 @@ else
 EXTRA_DIST = $(X11_SOURCES)
 endif
 
-servicedir       = $(DBUS_SERVICES_DIR)
+servicedir=$(datadir)/dbus-1/accessibility-services
 service_in_files = org.a11y.atspi.Registry.service.in
 service_DATA     = $(service_in_files:.service.in=.service)