* Complete conflict detection stuff (including probing et al)

* Introduce flxEntryGroups (replacing IDs)
* priorize main loop sources


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@33 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 3 insertions, 13 deletions

diff --git a/subscribe.h b/subscribe.h
index 6520433..2399077 100644
--- a/subscribe.h
+++ b/subscribe.h
@@ -1,19 +1,12 @@
 #ifndef foosubscribehfoo
 #define foosubscribehfoo
 
-typedef struct _flxSubscription flxSubscription;
-
 #include "llist.h"
+#include "flx.h"
+#include "subscribe.h"
+#include "timeeventq.h"
 #include "server.h"
 
-typedef enum {
-    FLX_SUBSCRIPTION_NEW,
-    FLX_SUBSCRIPTION_REMOVE,
-    FLX_SUBSCRIPTION_CHANGE
-} flxSubscriptionEvent;
-
-typedef void (*flxSubscriptionCallback)(flxSubscription *s, flxRecord *record, gint interface, guchar protocol, flxSubscriptionEvent event, gpointer userdata);
-
 struct _flxSubscription {
     flxServer *server;
     flxKey *key;
@@ -31,9 +24,6 @@ struct _flxSubscription {
     FLX_LLIST_FIELDS(flxSubscription, by_key);
 };
 
-flxSubscription *flx_subscription_new(flxServer *s, flxKey *key, gint interface, guchar protocol, flxSubscriptionCallback callback, gpointer userdata);
-void flx_subscription_free(flxSubscription *s);
-
 void flx_subscription_notify(flxServer *s, flxInterface *i, flxRecord *record, flxSubscriptionEvent event);
 
 gboolean flx_is_subscribed(flxServer *s, flxKey *k);