* rename AvahiSubscription to AvahiRecordResolver

[catta] / avahi-core / subscribe.h

diff --git a/avahi-core/subscribe.h b/avahi-core/subscribe.h
index 307393ecb40890105e2c19b832e5d57465e74de3..23b12e56edab377a44038e940cbc6c03f1eeb63c 100644 (file)
--- a/avahi-core/subscribe.h
+++ b/avahi-core/subscribe.h
@@ -23,12 +23,12 @@
 ***/
 
 #include "llist.h"
-#include "avahi.h"
+#include "core.h"
 #include "subscribe.h"
 #include "timeeventq.h"
 #include "server.h"
 
-struct _AvahiSubscription {
+struct AvahiRecordResolver {
     AvahiServer *server;
     AvahiKey *key;
     gint interface;
@@ -38,14 +38,14 @@ struct _AvahiSubscription {
 
     AvahiTimeEvent *time_event;
 
-    AvahiSubscriptionCallback callback;
+    AvahiRecordResolverCallback callback;
     gpointer userdata;
 
-    AVAHI_LLIST_FIELDS(AvahiSubscription, subscriptions);
-    AVAHI_LLIST_FIELDS(AvahiSubscription, by_key);
+    AVAHI_LLIST_FIELDS(AvahiRecordResolver, resolver);
+    AVAHI_LLIST_FIELDS(AvahiRecordResolver, by_key);
 };
 
-void avahi_subscription_notify(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, AvahiSubscriptionEvent event);
+void avahi_resolver_notify(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, AvahiBrowserEvent event);
 
 gboolean avahi_is_subscribed(AvahiServer *s, AvahiKey *k);