From ce4fd314c6be9bfee16a172d5ca34e5097d309fc Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 25 Mar 2003 04:37:08 +0000 Subject: 2003-03-24 Havoc Pennington * dbus/dbus-sysdeps.c (_dbus_set_fd_nonblocking): move to this file * dbus/dbus-errors.c (dbus_set_error, dbus_set_error_const): allow NULL argument for "message" if the error is a well-known one, fill in a generic message in this case. * dbus/dbus-errors.h (DBusResultCode): Kill DBusResultCode in favor of DBusError * bus/test.c (bus_test_flush_bus): add * bus/policy.c (bus_policy_test): test code stub --- bus/bus.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'bus/bus.c') diff --git a/bus/bus.c b/bus/bus.c index 304faa99..468d820b 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -143,7 +143,6 @@ bus_context_new (const char *address, DBusError *error) { BusContext *context; - DBusResultCode result; context = dbus_new0 (BusContext, 1); if (context == NULL) @@ -161,14 +160,9 @@ bus_context_new (const char *address, goto failed; } - context->server = dbus_server_listen (address, &result); + context->server = dbus_server_listen (address, error); if (context->server == NULL) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "Failed to start server on %s: %s\n", - address, dbus_result_to_string (result)); - goto failed; - } + goto failed; context->activation = bus_activation_new (context, address, service_dirs, error); -- cgit