diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-07-01 09:03:47 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-01 09:03:47 +0100 |
| commit | 233050353385b6917d6a5369914d1e6186701fe7 (patch) | |
| tree | 3b2c4dcd6c9284e39c69ad5c19279b07cf0efc57 /desktop | |
| parent | 01088bb63b1ab1ff7453c199a1c875483b1e5084 (diff) | |
| parent | 8944edd649e74e4864f36d7293921385ba5ca2c7 (diff) | |
| download | netsurf-233050353385b6917d6a5369914d1e6186701fe7.tar.gz netsurf-233050353385b6917d6a5369914d1e6186701fe7.tar.bz2 | |
Merge branch 'vince/fetchschedule'
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/netsurf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/desktop/netsurf.c b/desktop/netsurf.c index a1bc42b93..579648bae 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -29,7 +29,7 @@ #include "utils/config.h" #include "utils/utsname.h" #include "content/content_factory.h" -#include "content/fetch.h" +#include "content/fetchers.h" #include "content/hlcache.h" #include "content/mimesniff.h" #include "content/urldb.h" @@ -231,7 +231,7 @@ nserror netsurf_init(const char *messages, const char *store_path) setlocale(LC_ALL, "C"); /* initialise the fetchers */ - ret = fetch_init(); + ret = fetcher_init(); if (ret != NSERROR_OK) return ret; @@ -257,8 +257,7 @@ nserror netsurf_init(const char *messages, const char *store_path) int netsurf_main_loop(void) { while (!netsurf_quit) { - guit->browser->poll(fetch_active); - hlcache_poll(); + guit->browser->poll(false); } return 0; @@ -285,7 +284,7 @@ void netsurf_exit(void) hlcache_finalise(); LOG(("Closing fetches")); - fetch_quit(); + fetcher_quit(); mimesniff_fini(); @@ -310,5 +309,3 @@ void netsurf_exit(void) LOG(("Exited successfully")); } - - |