From 5640f7a57b6c8b2e1847e99db412db3c41c9eb98 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Wed, 1 Nov 2006 23:30:46 +0000
Subject: * 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
---
 test/data/valid-config-files/many-rules.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test')

diff --git a/test/data/valid-config-files/many-rules.conf b/test/data/valid-config-files/many-rules.conf
index ab05909f..0a15e83c 100644
--- a/test/data/valid-config-files/many-rules.conf
+++ b/test/data/valid-config-files/many-rules.conf
@@ -5,6 +5,7 @@
   <listen>unix:path=/foo/bar</listen>
   <listen>tcp:port=1234</listen>
   <includedir>basic.d</includedir>
+  <standard_session_servicedirs />
   <servicedir>/usr/share/foo</servicedir>
   <include ignore_missing="yes">nonexistent.conf</include>
   <policy context="default">
-- 
cgit