X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fannounce.h;h=9183258b55bbcda81e88711b02a33fcb3eebdadc;hb=d322a943be5387a539f8f3ea3a19a7e2ed5a55a2;hp=244a00f493443e3a4890a1ddbbc6e194a85e1905;hpb=f5a4db2039532ef93fbb3d98fa048be9d74a83fe;p=catta

diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index 244a00f..9183258 100644
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -22,14 +22,13 @@
   USA.
 ***/
 
-#include <glib.h>
-
 typedef struct AvahiAnnouncement AvahiAnnouncement;
 
-#include "llist.h"
+#include <avahi-common/llist.h>
 #include "iface.h"
 #include "server.h"
 #include "timeeventq.h"
+#include "publish.h"
 
 typedef enum {
     AVAHI_PROBING,
@@ -46,8 +45,8 @@ struct AvahiAnnouncement {
     AvahiTimeEvent *time_event;
 
     AvahiAnnouncementState state;
-    guint n_iteration;
-    guint sec_delay;
+    unsigned n_iteration;
+    unsigned sec_delay;
 
     AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_interface);
     AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_entry);
@@ -55,19 +54,19 @@ struct AvahiAnnouncement {
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i);
 void avahi_announce_entry(AvahiServer *s, AvahiEntry *e);
-void avahi_announce_group(AvahiServer *s, AvahiEntryGroup *g);
+void avahi_announce_group(AvahiServer *s, AvahiSEntryGroup *g);
 
 void avahi_entry_return_to_initial_state(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
-void avahi_entry_group_check_probed(AvahiEntryGroup *g, gboolean immediately);
+void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately);
 
-gboolean avahi_entry_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
-gboolean avahi_entry_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
+int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
+int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
-void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, gboolean send);
-void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, gboolean send);
+void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye);
+void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye);
 
-void avahi_goodbye_all(AvahiServer *s, gboolean send);
+void avahi_goodbye_all(AvahiServer *s, int send_goodbye);
 
 AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);