* drop AVAHI_RESOLVER_TIMEOUT, AVAHI_RESOLVER_NOT_FOUND and AVAHI_BROWSER_NOT_FOUND...

[catta] / avahi-glib / glib-watch-test.c

diff --git a/avahi-glib/glib-watch-test.c b/avahi-glib/glib-watch-test.c
index 50723218540ccaeb07eab181ece3af5743017046..73114d1d79c139011a23f6b412af482ff87d0c2b 100644 (file)
--- a/avahi-glib/glib-watch-test.c
+++ b/avahi-glib/glib-watch-test.c
@@ -33,7 +33,7 @@
 #include <avahi-common/timeval.h>
 #include "glib-watch.h"
 
-static AvahiPoll *api = NULL;
+static const AvahiPoll *api = NULL;
 static GMainLoop *loop = NULL;
 
 static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdata) {
@@ -52,36 +52,38 @@ static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdat
     }
 }
 
-static void iteration(AvahiGLibPoll *p, void *userdata) {
+static void wakeup(AvahiTimeout *t, void *userdata) {
     struct timeval tv;
     static int i = 0;
 
-    printf("Iteration %i\n", i++);
+    printf("Wakeup #%i\n", i++);
 
-    if (i > 100)
+    if (i > 10)
         g_main_loop_quit(loop);
 
     avahi_elapse_time(&tv, 1000, 0);
-    api->set_wakeup_time(api, &tv);
+    api->timeout_update(t, &tv);
 }
 
 int main(int argc, char *argv[]) {
-    AvahiGLibPoll *s;
+    AvahiGLibPoll *g;
     struct timeval tv;
     
-    s = avahi_glib_poll_new(NULL, iteration, NULL);
-    assert(s);
+    g = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
+    assert(g);
 
-    api = avahi_glib_poll_get(s);
+    api = avahi_glib_poll_get(g);
 
     api->watch_new(api, 0, AVAHI_WATCH_IN, callback, NULL);
 
     avahi_elapse_time(&tv, 1000, 0);
-    api->set_wakeup_time(api, &tv);
+    api->timeout_new(api, &tv, wakeup, NULL);
 
     loop = g_main_loop_new(NULL, FALSE);
     g_main_loop_run(loop);
     g_main_loop_unref(loop);
+
+    avahi_glib_poll_free(g);
     
     return 0;
 }