* progress on python port of avahi-discover basic things are in place

[catta] / avahi-core / timeeventq.h

diff --git a/avahi-core/timeeventq.h b/avahi-core/timeeventq.h
index 26ced90265381ffc604d00e910e97dc3df1bbcd8..a2544ff2cbe14525badb82ea12c46136272891f7 100644 (file)
--- a/avahi-core/timeeventq.h
+++ b/avahi-core/timeeventq.h
@@ -22,20 +22,23 @@
   USA.
 ***/
 
-typedef struct _AvahiTimeEventQueue AvahiTimeEventQueue;
-typedef struct _AvahiTimeEvent AvahiTimeEvent;
+typedef struct AvahiTimeEventQueue AvahiTimeEventQueue;
+typedef struct AvahiTimeEvent AvahiTimeEvent;
 
 #include "prioq.h"
 
-struct _AvahiTimeEvent {
+typedef void (*AvahiTimeEventCallback)(AvahiTimeEvent *e, gpointer userdata);
+
+struct AvahiTimeEvent {
     AvahiTimeEventQueue *queue;
     AvahiPrioQueueNode *node;
     GTimeVal expiry;
-    void (*callback)(AvahiTimeEvent *e, void *userdata);
-    void *userdata;
+    GTimeVal last_run;
+    AvahiTimeEventCallback callback;
+    gpointer userdata;
 };
 
-struct _AvahiTimeEventQueue {
+struct AvahiTimeEventQueue {
     GSource source;
     AvahiPrioQueue *prioq;
 };
@@ -43,7 +46,7 @@ struct _AvahiTimeEventQueue {
 AvahiTimeEventQueue* avahi_time_event_queue_new(GMainContext *context, gint priority);
 void avahi_time_event_queue_free(AvahiTimeEventQueue *q);
 
-AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, void (*callback)(AvahiTimeEvent *e, void *userdata), void *userdata);
+AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, AvahiTimeEventCallback callback, gpointer userdata);
 void avahi_time_event_queue_remove(AvahiTimeEventQueue *q, AvahiTimeEvent *e);
 
 void avahi_time_event_queue_update(AvahiTimeEventQueue *q, AvahiTimeEvent *e, const GTimeVal *timeval);
@@ -51,7 +54,4 @@ void avahi_time_event_queue_update(AvahiTimeEventQueue *q, AvahiTimeEvent *e, co
 AvahiTimeEvent* avahi_time_event_queue_root(AvahiTimeEventQueue *q);
 AvahiTimeEvent* avahi_time_event_next(AvahiTimeEvent *e);
 
-
-
-
 #endif