2003-03-31 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket)
	(_dbus_transport_new_for_tcp_socket): these didn't need the "server"
	argument since they are always client side

	* dbus/dbus-server.c (dbus_server_get_address): new function

	* bus/main.c (main): take the configuration file as an argument.

	* test/data/valid-config-files/debug-allow-all.conf: new file to
	use with dispatch.c tests for example

	* bus/test-main.c (main): require test data dir

	* bus/bus.c (bus_context_new): change this to take a
	configuration file name as argument

	* doc/config-file.txt (Elements): add <servicedir>

	* bus/system.conf, bus/session.conf: new files

	* dbus/dbus-bus.c (dbus_bus_get): look for system bus on
	well-known socket if none set

	* configure.in: create system.conf and session.conf

1 files changed, 12 insertions, 14 deletions

diff --git a/bus/bus.h b/bus/bus.h
index 56ed5156..3e2dc465 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -38,19 +38,17 @@ typedef struct BusRegistry    BusRegistry;
 typedef struct BusService     BusService;
 typedef struct BusTransaction BusTransaction;
 
-BusContext*     bus_context_new                      (const char      *address,
-                                                      const char     **service_dirs,
-                                                      DBusError       *error);
-void            bus_context_shutdown                 (BusContext      *context);
-void            bus_context_ref                      (BusContext      *context);
-void            bus_context_unref                    (BusContext      *context);
-BusRegistry*    bus_context_get_registry             (BusContext      *context);
-BusConnections* bus_context_get_connections          (BusContext      *context);
-BusActivation*  bus_context_get_activation           (BusContext      *context);
-dbus_bool_t     bus_context_allow_user               (BusContext      *context,
-                                                      unsigned long    uid);
-BusPolicy*      bus_context_create_connection_policy (BusContext      *context,
-                                                      DBusConnection  *connection);
-
+BusContext*     bus_context_new                      (const DBusString *config_file,
+                                                      DBusError        *error);
+void            bus_context_shutdown                 (BusContext       *context);
+void            bus_context_ref                      (BusContext       *context);
+void            bus_context_unref                    (BusContext       *context);
+BusRegistry*    bus_context_get_registry             (BusContext       *context);
+BusConnections* bus_context_get_connections          (BusContext       *context);
+BusActivation*  bus_context_get_activation           (BusContext       *context);
+dbus_bool_t     bus_context_allow_user               (BusContext       *context,
+                                                      unsigned long     uid);
+BusPolicy*      bus_context_create_connection_policy (BusContext       *context,
+                                                      DBusConnection   *connection);
 
 #endif /* BUS_BUS_H */