* Show some messages when pygtk or twisted is missing for the execution of the python...

[catta] / avahi-core / browse-service-type.c

diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
index d9816927209d769df74adb0c41e270b743ca8254..7cd6cf76ebc725730a33eb90cd0350b2530eab4c 100644 (file)
--- a/avahi-core/browse-service-type.c
+++ b/avahi-core/browse-service-type.c
@@ -27,6 +27,7 @@
 
 #include "browse.h"
 #include "util.h"
+#include "log.h"
 
 struct AvahiServiceTypeBrowser {
     AvahiServer *server;
@@ -40,7 +41,7 @@ struct AvahiServiceTypeBrowser {
     AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, browser);
 };
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
     AvahiServiceTypeBrowser *b = userdata;
     gchar *n, *e, *c;
 
@@ -71,17 +72,17 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     if (!avahi_domain_equal(c, b->domain_name))
         goto fail;
     
-    b->callback(b, interface, protocol, event, n, b->domain_name, b->userdata);
+    b->callback(b, interface, protocol, event, n, c, b->userdata);
     g_free(n);
 
     return;
 
 fail:
-    g_warning("Invalid service type '%s'", n);
+    avahi_log_warn("Invalid service type '%s'", n);
     g_free(n);
 }
 
-AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
+AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gint interface, AvahiProtocol protocol, const gchar *domain, AvahiServiceTypeBrowserCallback callback, gpointer userdata) {
     AvahiServiceTypeBrowser *b;
     AvahiKey *k;
     gchar *n = NULL;
@@ -91,7 +92,7 @@ AvahiServiceTypeBrowser *avahi_service_type_browser_new(AvahiServer *server, gin
 
     b = g_new(AvahiServiceTypeBrowser, 1);
     b->server = server;
-    b->domain_name = avahi_normalize_name(domain ? domain : "local.");
+    b->domain_name = avahi_normalize_name(domain ? domain : "local");
     b->callback = callback;
     b->userdata = userdata;