* remove AVAHI_PUBLISH_IS_PROXY, it was a bad idea

[catta] / avahi-client / client.c

diff --git a/avahi-client/client.c b/avahi-client/client.c
index be52cc928b3689506b21ca3a4eafd7f723207a87..8bc515ee5aa42ff38f99fc5dccca25cda6c920f5 100644 (file)
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -178,8 +178,6 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
         return avahi_domain_browser_event(client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
     else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "AllForNow")) 
         return avahi_domain_browser_event(client, AVAHI_BROWSER_ALL_FOR_NOW, message);
-    else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "NotFound")) 
-        return avahi_domain_browser_event(client, AVAHI_BROWSER_NOT_FOUND, message);
     else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Failure")) 
         return avahi_domain_browser_event(client, AVAHI_BROWSER_FAILURE, message);
 
@@ -191,8 +189,6 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
         return avahi_service_type_browser_event (client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "AllForNow")) 
         return avahi_service_type_browser_event (client, AVAHI_BROWSER_ALL_FOR_NOW, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "NotFound")) 
-        return avahi_service_type_browser_event (client, AVAHI_BROWSER_NOT_FOUND, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Failure")) 
         return avahi_service_type_browser_event (client, AVAHI_BROWSER_FAILURE, message);
 
@@ -204,35 +200,21 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
         return avahi_service_browser_event (client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "AllForNow")) 
         return avahi_service_browser_event (client, AVAHI_BROWSER_ALL_FOR_NOW, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "NotFound")) 
-        return avahi_service_browser_event (client, AVAHI_BROWSER_NOT_FOUND, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Failure")) 
         return avahi_service_browser_event (client, AVAHI_BROWSER_FAILURE, message);
 
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Found")) 
         return avahi_service_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Timeout")) 
-        return avahi_service_resolver_event (client, AVAHI_RESOLVER_TIMEOUT, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "NotFound")) 
-        return avahi_service_resolver_event (client, AVAHI_RESOLVER_NOT_FOUND, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Failure")) 
         return avahi_service_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
 
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Found")) 
         return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Timeout")) 
-        return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_TIMEOUT, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "NotFound")) 
-        return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_NOT_FOUND, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Failure")) 
         return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
 
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Found")) 
         return avahi_address_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Timeout")) 
-        return avahi_address_resolver_event (client, AVAHI_RESOLVER_TIMEOUT, message);
-    else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "NotFound")) 
-        return avahi_address_resolver_event (client, AVAHI_RESOLVER_NOT_FOUND, message);
     else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Failure")) 
         return avahi_address_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
     
@@ -743,70 +725,3 @@ fail:
 
     return AVAHI_SERVICE_COOKIE_INVALID;
 }
-
-int avahi_client_is_service_local(AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *type, const char *domain) {
-    DBusMessage *message = NULL, *reply = NULL;
-    DBusError error;
-    int32_t i_interface, i_protocol;
-    int b;
-
-    assert(client);
-    assert(name);
-    assert(type);
-    assert(domain);
-
-    if (client->state == AVAHI_CLIENT_DISCONNECTED) {
-        avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
-        return AVAHI_SERVICE_COOKIE_INVALID;
-    }
-
-    dbus_error_init (&error);
-
-    if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "IsServiceLocal"))) {
-        avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
-        goto fail;
-    }
-
-    i_interface = (int32_t) interface;
-    i_protocol = (int32_t) protocol;
-    
-    if (!dbus_message_append_args(
-            message,
-            DBUS_TYPE_INT32, &i_interface,
-            DBUS_TYPE_INT32, &i_protocol,
-            DBUS_TYPE_STRING, &name,
-            DBUS_TYPE_STRING, &type,
-            DBUS_TYPE_STRING, &domain,
-            DBUS_TYPE_INVALID)) {
-        avahi_client_set_errno (client, AVAHI_ERR_NO_MEMORY);
-        goto fail;
-    }
-
-    reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error);
-
-    if (!reply || dbus_error_is_set (&error))
-        goto fail;
-
-    if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &b, DBUS_TYPE_INVALID) ||
-        dbus_error_is_set (&error))
-        goto fail;
-    
-    dbus_message_unref(message);
-    dbus_message_unref(reply);
-
-    return b;
-
-fail:
-
-    if (message)
-        dbus_message_unref(message);
-    if (reply)
-        dbus_message_unref(reply);
-    
-    if (dbus_error_is_set(&error)) {
-        avahi_client_set_dbus_error(client, &error);
-        dbus_error_free(&error);
-    }
-
-    return AVAHI_SERVICE_COOKIE_INVALID;
-}