From 4e2113a7d5b702ff070e8220b32662bb00ae02dd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 6 Nov 2005 16:12:03 +0000 Subject: * Rename AVAHI_ERR_NOT_CONNECTED to AVAHI_ERR_DISCONNECTED * Remove client state AVAHI_CLIENT_DISCONNECTED and replace it with AVAHI_CLIENT_FAILURE with error code set to AVAHI_ERR_DISCONNECTED git-svn-id: file:///home/lennart/svn/public/avahi/trunk@935 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/browser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'avahi-client/browser.c') diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 1ac2e20..bf9c15f 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -125,7 +125,7 @@ AvahiDomainBrowser* avahi_domain_browser_new( dbus_error_init (&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -248,7 +248,7 @@ int avahi_domain_browser_free (AvahiDomainBrowser *b) { client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiDomainBrowser, domain_browsers, client->domain_browsers, b); @@ -367,7 +367,7 @@ AvahiServiceTypeBrowser* avahi_service_type_browser_new( dbus_error_init(&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -473,7 +473,7 @@ int avahi_service_type_browser_free (AvahiServiceTypeBrowser *b) { assert(b); client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, service_type_browsers, b->client->service_type_browsers, b); @@ -583,7 +583,7 @@ AvahiServiceBrowser* avahi_service_browser_new( dbus_error_init(&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -694,7 +694,7 @@ int avahi_service_browser_free (AvahiServiceBrowser *b) { assert(b); client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiServiceBrowser, service_browsers, b->client->service_browsers, b); -- cgit