From a1ad29b4108200dc50978f4f71c92394144e2c4a Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Wed, 28 Sep 2005 11:30:00 +0000 Subject: * Merge 600:602 from trunk into branches/working-0.5.x - Fix no daemon error reporting git-svn-id: file:///home/lennart/svn/public/avahi/branches/working-0.5.x@645 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/client.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/avahi-client/client.c b/avahi-client/client.c index 93d768a..f28d4e3 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -363,6 +363,10 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientCallback cal if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) || dbus_error_is_set(&error)) { + /* We free the error so its not set, that way the fail target + * will return the NO_DAEMON error rather than a DBUS error */ + dbus_error_free (&error); + if (ret_error) *ret_error = AVAHI_ERR_NO_DAEMON; -- cgit