From 769c00f228ba0d37217aaf1424dedde390e7a01c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 14 Aug 2005 22:11:35 +0000 Subject: * add new priority parameter to avahi_glib_poll_new() * beef up AvahiPoll a little to contain real timeout events * cleanups in avahi-client * drop glib dependency * port to AvahiPoll system * put some "const"s and "static"s in to make gcc shut up * change all uses of malloc/free to avahi_malloc/avahi_new/avahi_free git-svn-id: file:///home/lennart/svn/public/avahi/trunk@324 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-glib/glib-watch-test.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'avahi-glib/glib-watch-test.c') diff --git a/avahi-glib/glib-watch-test.c b/avahi-glib/glib-watch-test.c index 17b334d..73114d1 100644 --- a/avahi-glib/glib-watch-test.c +++ b/avahi-glib/glib-watch-test.c @@ -52,7 +52,7 @@ static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdat } } -static void wakeup(AvahiPoll *_api, void *userdata) { +static void wakeup(AvahiTimeout *t, void *userdata) { struct timeval tv; static int i = 0; @@ -62,26 +62,28 @@ static void wakeup(AvahiPoll *_api, void *userdata) { g_main_loop_quit(loop); avahi_elapse_time(&tv, 1000, 0); - api->set_wakeup(api, &tv, wakeup, NULL); + api->timeout_update(t, &tv); } int main(int argc, char *argv[]) { - AvahiGLibPoll *s; + AvahiGLibPoll *g; struct timeval tv; - s = avahi_glib_poll_new(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(api, &tv, wakeup, NULL); + 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; } -- cgit