diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-09-16 19:24:08 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-09-16 19:24:08 +0000 |
| commit | fe4715b656237b89767b5dc0cba4c107541b6e0d (patch) | |
| tree | 8defca3126803c37043110e7edb81dfa5476fceb /dbus/dbus-server.c | |
| parent | e001455a0300cc1df17684a028049c8c33e4f575 (diff) | |
2006-09-16 Havoc Pennington <hp@redhat.com>
* dbus/dbus-transport.c (_dbus_transport_open): modify to delegate
to _dbus_transport_open_platform_specific,
_dbus_transport_open_socket,
and _dbus_transport_open_debug_pipe
* dbus/dbus-transport-protected.h: add _dbus_transport_open_platform_specific
Diffstat (limited to 'dbus/dbus-server.c')
| -rw-r--r-- | dbus/dbus-server.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 7a140fd3..883b361b 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -442,22 +442,6 @@ _dbus_server_toggle_timeout (DBusServer *server, enabled); } -void -_dbus_server_set_bad_address (DBusError *error, - const char *address_problem_type, - const char *address_problem_field, - const char *address_problem_other) -{ - if (address_problem_type != NULL) - dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS, - "Server address of type %s was missing argument %s", - address_problem_type, address_problem_field); - else - dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS, - "Could not parse server address: %s", - address_problem_other); -} - /** @} */ /** @@ -493,7 +477,11 @@ static const struct { /** * Listens for new connections on the given address. - * Returns #NULL if listening fails for any reason. + * If there are multiple address entries in the address, + * tries each one and listens on the first one that + * works. + * + * Returns #NULL and sets error if listening fails for any reason. * Otherwise returns a new #DBusServer. * dbus_server_set_new_connection_function() and * dbus_server_set_watch_functions() should be called |