diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-08-31 17:17:18 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-08-31 17:17:18 +0000 |
| commit | 59f3e8bef545762113c041a1ef5868e08b353045 (patch) | |
| tree | 345b3d7b45f4a01c581cc340607fb3ba232a3442 /avahi-daemon | |
| parent | 16ede7fb33fde566f43390d8dcf22d49f52c80e4 (diff) | |
autoconf love:
* use autoconf to check whether dbus_connection_close() is available and use it
if it is, don't do those checks based on the D-Bus version.
* Make use of dbus_bus_get_private() if it is available.
* Since D-Bus agreeed on a cononical way to write their name, use that way in
configure.ac.
* Add configure options to define the UNIX user/group for avahi-autoipd
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1295 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
| -rw-r--r-- | avahi-daemon/dbus-protocol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index 4fb58d2..e74caa3 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -1130,7 +1130,7 @@ fail: dbus_error_free(&error); if (server->bus) { -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 62) +#ifdef HAVE_DBUS_CONNECTION_CLOSE dbus_connection_close(server->bus); #else dbus_connection_disconnect(server->bus); @@ -1151,7 +1151,7 @@ static void dbus_disconnect(void) { assert(server->n_clients == 0); if (server->bus) { -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 62) +#ifdef HAVE_DBUS_CONNECTION_CLOSE dbus_connection_close(server->bus); #else dbus_connection_disconnect(server->bus); @@ -1180,7 +1180,7 @@ int dbus_protocol_setup(const AvahiPoll *poll_api, int _disable_user_service_pub if (!force) goto fail; - avahi_log_warn("WARNING: Failed to contact D-BUS daemon, retrying in %ims.", RECONNECT_MSEC); + avahi_log_warn("WARNING: Failed to contact D-Bus daemon, retrying in %ims.", RECONNECT_MSEC); avahi_elapse_time(&tv, RECONNECT_MSEC, 0); server->reconnect_timeout = server->poll_api->timeout_new(server->poll_api, &tv, reconnect_callback, NULL); @@ -1190,7 +1190,7 @@ int dbus_protocol_setup(const AvahiPoll *poll_api, int _disable_user_service_pub fail: if (server->bus) { -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 62) +#ifdef HAVE_DBUS_CONNECTION_CLOSE dbus_connection_close(server->bus); #else dbus_connection_disconnect(server->bus); |