Merge branch 'chris/scheduled-fetches' of git://git.netsurf-browser.org/netsurf into chris/scheduled-fetches

This commit is contained in:
Chris Young 2013-04-15 23:47:01 +01:00
commit 83af8b35b2
2 changed files with 7 additions and 7 deletions

View File

@ -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();
}

View File

@ -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();
}