summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/fetchers/curl.c14
-rw-r--r--content/hlcache.c8
2 files changed, 11 insertions, 11 deletions
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index d58b7d54a..612b77d0b 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -36,25 +36,25 @@
#include <strings.h>
#include <time.h>
#include <sys/stat.h>
+#include <openssl/ssl.h>
#include <libwapcaplet/libwapcaplet.h>
#include "utils/config.h"
-#include <openssl/ssl.h>
-#include "content/fetch.h"
-#include "content/fetchers/curl.h"
-#include "content/urldb.h"
#include "desktop/netsurf.h"
#include "desktop/gui_factory.h"
#include "utils/corestrings.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/schedule.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/useragent.h"
+#include "content/fetch.h"
+#include "content/fetchers/curl.h"
+#include "content/urldb.h"
+
/* uncomment this to use scheduler based calling
#define FETCHER_CURLL_SCHEDULED 1
*/
@@ -504,7 +504,7 @@ bool fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, CURL *handle)
codem = curl_multi_add_handle(fetch_curl_multi, fetch->curl_handle);
assert(codem == CURLM_OK || codem == CURLM_CALL_MULTI_PERFORM);
- schedule(1, (schedule_callback_fn)fetch_curl_poll, NULL);
+ guit->browser->schedule(10, (void *)fetch_curl_poll, NULL);
return true;
}
@@ -837,7 +837,7 @@ void fetch_curl_poll(lwc_string *scheme_ignored)
#ifdef FETCHER_CURLL_SCHEDULED
if (running != 0) {
- schedule(1, (schedule_callback_fn)fetch_curl_poll, fetch_curl_poll);
+ guit->browser->schedule(10, fetch_curl_poll, fetch_curl_poll);
}
#endif
}
diff --git a/content/hlcache.c b/content/hlcache.c
index 618f4fd1e..16f9697ef 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
+#include "desktop/gui_factory.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/mimesniff.h"
@@ -31,7 +32,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/ring.h"
-#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utils.h"
@@ -146,7 +146,7 @@ static void hlcache_clean(void *ignored)
llcache_clean();
/* Re-schedule ourselves */
- schedule(hlcache->params.bg_clean_time / 10, hlcache_clean, NULL);
+ guit->browser->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL);
}
/**
@@ -536,7 +536,7 @@ hlcache_initialise(const struct hlcache_parameters *hlcache_parameters)
hlcache->params = *hlcache_parameters;
/* Schedule the cache cleanup */
- schedule(hlcache->params.bg_clean_time / 10, hlcache_clean, NULL);
+ guit->browser->schedule(hlcache->params.bg_clean_time, hlcache_clean, NULL);
return NSERROR_OK;
}
@@ -545,7 +545,7 @@ hlcache_initialise(const struct hlcache_parameters *hlcache_parameters)
void hlcache_stop(void)
{
/* Remove the hlcache_clean schedule */
- schedule_remove(hlcache_clean, NULL);
+ guit->browser->schedule(-1, hlcache_clean, NULL);
}
/* See hlcache.h for documentation */