From 29c71168cd17b11eed65023c97aff401d5305b01 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 31 Mar 2003 08:19:50 +0000 Subject: 2003-03-31 Havoc Pennington * 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 * 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 --- bus/dispatch.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'bus/dispatch.c') diff --git a/bus/dispatch.c b/bus/dispatch.c index 2b1dc782..e75d8e6d 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -958,18 +958,17 @@ dbus_bool_t bus_dispatch_test (const DBusString *test_data_dir) { BusContext *context; - DBusError error; - const char *activation_dirs[] = { NULL, NULL }; DBusConnection *foo; DBusConnection *bar; DBusConnection *baz; + DBusError error; + + context = bus_context_new_test (test_data_dir, + "valid-config-files/debug-allow-all.conf"); + if (context == NULL) + return FALSE; dbus_error_init (&error); - context = bus_context_new ("debug-pipe:name=test-server", - activation_dirs, - &error); - if (context == NULL) - _dbus_assert_not_reached ("could not alloc context"); foo = dbus_connection_open ("debug-pipe:name=test-server", &error); if (foo == NULL) -- cgit