diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-04-15 23:47:01 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-04-15 23:47:01 +0100 |
| commit | 83af8b35b248f877177e72d667d903c5bd13f6c3 (patch) | |
| tree | 975be7f5cdab3b8fb35ddbf07e744b9de7311f3e | |
| parent | dcbbe9901e56f566f012e87651cc17f387cdcdf1 (diff) | |
| parent | 6557bae1a22a5522a363818a4808bf440e900014 (diff) | |
| download | netsurf-83af8b35b248f877177e72d667d903c5bd13f6c3.tar.gz netsurf-83af8b35b248f877177e72d667d903c5bd13f6c3.tar.bz2 | |
Merge branch 'chris/scheduled-fetches' of git://git.netsurf-browser.org/netsurf into chris/scheduled-fetches
| -rw-r--r-- | amiga/gui.c | 7 | ||||
| -rw-r--r-- | desktop/netsurf.c | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index b6de46df9..c3a163fe6 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -17,6 +17,7 @@ */ /* NetSurf core includes */ +#include "content/hlcache.h" #include "content/urldb.h" #include "css/utils.h" #include "desktop/browser_private.h" @@ -2459,8 +2460,14 @@ printf("sig recvd %ld (%ld %ld %ld %ld %ld %ld)\n", signal, winsignal , appsig , } } +static void ami_gui_fetch_callback(void *p) +{ + hlcache_poll(); +} + void gui_poll(bool active) { + if(active) schedule(0, ami_gui_fetch_callback, NULL); ami_get_msg(); } diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 120bda9e3..0b1cffe0a 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -27,7 +27,6 @@ #include <libwapcaplet/libwapcaplet.h> #include "utils/config.h" -#include "utils/schedule.h" #include "utils/utsname.h" #include "content/content_factory.h" #include "content/fetch.h" @@ -240,10 +239,6 @@ nserror netsurf_init(int *pargc, return ret; } -static void netsurf_fetch_callback(void *p) -{ - hlcache_poll(); -} /** * Gui NetSurf main loop. @@ -251,8 +246,6 @@ static void netsurf_fetch_callback(void *p) int netsurf_main_loop(void) { while (!netsurf_quit) { - if(fetch_active) - schedule(0, netsurf_fetch_callback, NULL); gui_poll(fetch_active); hlcache_poll(); } |