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/activation.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'bus/activation.c') diff --git a/bus/activation.c b/bus/activation.c index 03a01937..8def99b9 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -323,10 +323,10 @@ load_directory (BusActivation *activation, } BusActivation* -bus_activation_new (BusContext *context, - const char *address, - const char **directories, - DBusError *error) +bus_activation_new (BusContext *context, + const DBusString *address, + const char **directories, + DBusError *error) { int i; BusActivation *activation; @@ -343,9 +343,7 @@ bus_activation_new (BusContext *context, activation->refcount = 1; activation->context = context; - /* FIXME: We should split up the server addresses. */ - activation->server_address = _dbus_strdup (address); - if (activation->server_address == NULL) + if (!_dbus_string_copy_data (address, &activation->server_address)) { BUS_SET_OOM (error); goto failed; -- cgit