From 524ddfcb34c2050f008a4797357c5c2abc48ca55 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 2 Nov 2006 04:26:23 +0000 Subject: 2006-11-01 Havoc Pennington * bus/dbus-daemon.1.in: document standard_session_servicedirs --- ChangeLog | 4 ++++ bus/dbus-daemon.1.in | 21 +++++++++++++++++++++ dbus/dbus-sysdeps.h | 14 ++++++++------ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cad03d59..853880b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-11-01 Havoc Pennington + + * bus/dbus-daemon.1.in: document standard_session_servicedirs + 2006-11-01 John (J5) Palmieri * configure.in: expose DBUS_DATADIR diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in index 3eb016b9..2298bb75 100644 --- a/bus/dbus-daemon.1.in +++ b/bus/dbus-daemon.1.in @@ -246,6 +246,27 @@ Service files tell the bus how to automatically start a program. They are primarily used with the per-user-session bus, not the systemwide bus. +.TP +.I "" + +.PP + is equivalent to specifying a series +of elements for each of the data directories in the "XDG +Base Directory Specification" with the subdirectory "dbus-1/services", +so for example "/usr/share/dbus-1/services" would be among the +directories searched. + +.PP +The "XDG Base Directory Specification" can be found at +http://freedesktop.org/wiki/Standards/basedir-spec if it hasn't moved, +otherwise try your favorite search engine. + +.PP +The option is only relevant to the +per-user-session bus daemon defined in +@EXPANDED_SYSCONFDIR@/dbus-1/session.conf. Putting it in any other +configuration file would probably be nonsense. + .TP .I "" diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index e7b3eac0..2218cfc1 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -41,6 +41,14 @@ DBUS_BEGIN_DECLS +/* Forward declarations */ + +/** An opaque string type */ +typedef struct DBusString DBusString; + +/** An opaque list type */ +typedef struct DBusList DBusList; + /** * @addtogroup DBusSysdeps * @@ -56,12 +64,6 @@ DBUS_BEGIN_DECLS * dbus-memory.c) */ -/** An opaque string type */ -typedef struct DBusString DBusString; - -/** avoid circular includes with DBusList */ -typedef struct DBusList DBusList; - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #define _DBUS_GNUC_PRINTF( format_idx, arg_idx ) \ __attribute__((__format__ (__printf__, format_idx, arg_idx))) -- cgit