summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagdalen Berns <m.berns@thismagpie.com>2014-09-26 18:17:51 +0100
committerMike Gorse <mgorse@suse.com>2014-10-07 04:14:47 -0500
commit5ef30626a68a0c42cf36f414e3baf43de06e2a8d (patch)
tree4d1bcae008786f365db1285d0e5e6f4a1da8200c
parent1b80c50bcf26c508080e6c1b6dd79623a0d28589 (diff)
downloadat-spi2-core-5ef30626a68a0c42cf36f414e3baf43de06e2a8d.tar.gz
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
-rw-r--r--bus/Makefile.am2
-rw-r--r--bus/accessibility.conf2
-rw-r--r--registryd/Makefile.am2
3 files changed, 2 insertions, 4 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am
index de6ea4fb..c65de948 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 b9367d01..a5c770e3 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 43cb1477..c9c9d395 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)