use /bin/sh

[catta] / avahi-core / announce.h

diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index 71b2f034a32451ac1abf11f1591349d53c039525..9183258b55bbcda81e88711b02a33fcb3eebdadc 100644 (file)
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -22,14 +22,13 @@
   USA.
 ***/
 
-#include <glib.h>
+typedef struct AvahiAnnouncement AvahiAnnouncement;
 
-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,
@@ -38,7 +37,7 @@ typedef enum {
     AVAHI_ESTABLISHED
 } AvahiAnnouncementState;
 
-struct _AvahiAnnouncement {
+struct AvahiAnnouncement {
     AvahiServer *server;
     AvahiInterface *interface;
     AvahiEntry *entry;
@@ -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,17 +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_registering(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);