diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-11-01 23:30:46 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-11-01 23:30:46 +0000 |
| commit | 5640f7a57b6c8b2e1847e99db412db3c41c9eb98 (patch) | |
| tree | 206f2e037572003d5a20d285592e1e7267cb7509 /bus/session.conf.in | |
| parent | d3440ebe9de8ac9f817ae992244463c197c20f84 (diff) | |
| download | dbus-5640f7a57b6c8b2e1847e99db412db3c41c9eb98.tar.gz | |
* configure.in: expose DBUS_DATADIR
* bus/config-parser.c: add the standard_session_servicedirs element
to the parser
(bus_config_parser_content): process the standard_session_servicedirs
element by getting the standard directories from sysdeps and merging
them into the service directory list
(test_default_session_servicedirs): make sure we get what we expect
* bus/session.conf.in: replace the servicedir tag with the
standard_session_servicedirs tag
* dbus/dbus-list.h: remove the typedef of DBusList and place it in
dbus-sysdeps.h to avoid circular header dependencies
* dbus/dbus-sysdeps.h: add the typedef of DBusList
* dbus/dbus-sysdeps-unix.c (split_paths_and_append): utility function
which takes a string of directories delimited by colons, parses them
out, appends a suffix and puts them in a list ignoring empty elements
(_dbus_get_standard_session_servicedirs): returns the standard
directories for a session bus to look for service activation files
on Unix which includes the XDG_DATA_HOME, XDG_DATA_DIRS and
DBUS_DATADIR directories
* test/data/valid-config-files/many-rules.conf: add the
standard_session_servicedirs tag to the valid config file tests
Diffstat (limited to 'bus/session.conf.in')
| -rw-r--r-- | bus/session.conf.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in index ac93b429..344efc54 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -10,7 +10,7 @@ <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> - <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir> + <standard_session_servicedirs /> <policy context="default"> <!-- Allow everything to be sent --> |