nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disk cache is now handled through WebKit

Browse source
This commit is contained in:
Quentin Rameau 2015-11-18 15:10:42 +01:00
parent 7c34b37786
commit e39b7e623c
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
surf.c
View file

@ -96,7 +96,6 @@ static char pagestat[3];
static GTlsDatabase *tlsdb; static GTlsDatabase *tlsdb;
static int cookiepolicy; static int cookiepolicy;
static char *stylefile = NULL; static char *stylefile = NULL;
static SoupCache *diskcache = NULL;
static void addaccelgroup(Client *c); static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
@ -328,10 +327,6 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c)
void void
cleanup(void) cleanup(void)
{ {
if (diskcache) {
soup_cache_flush(diskcache);
soup_cache_dump(diskcache);
}
while (clients) while (clients)
destroyclient(clients); destroyclient(clients);
g_free(cookiefile); g_free(cookiefile);
@ -730,10 +725,6 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
case WEBKIT_LOAD_FINISHED: case WEBKIT_LOAD_FINISHED:
c->progress = 100; c->progress = 100;
updatetitle(c); updatetitle(c);
if (diskcache) {
soup_cache_flush(diskcache);
soup_cache_dump(diskcache);
}
break; break;
default: default:
break; break;
@ -1211,7 +1202,6 @@ setup(void)
{ {
int i; int i;
char *styledirfile, *stylepath; char *styledirfile, *stylepath;
SoupSession *s;
WebKitWebContext *context; WebKitWebContext *context;
GError *error = NULL; GError *error = NULL;
@ -1255,9 +1245,6 @@ setup(void)
g_free(stylepath); g_free(stylepath);
} }
/* request handler */
s = webkit_get_default_session();
/* cookie policy */ /* cookie policy */
webkit_cookie_manager_set_persistent_storage( webkit_cookie_manager_set_persistent_storage(
webkit_web_context_get_cookie_manager(context), cookiefile, webkit_web_context_get_cookie_manager(context), cookiefile,
@ -1267,13 +1254,9 @@ setup(void)
cookiepolicy_get()); cookiepolicy_get());
/* disk cache */ /* disk cache */
if (enablediskcache) { webkit_web_context_set_cache_model(context, enablecache ?
diskcache = soup_cache_new(cachefolder, WEBKIT_CACHE_MODEL_WEB_BROWSER :
SOUP_CACHE_SINGLE_USER); WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
soup_cache_set_max_size(diskcache, diskcachebytes);
soup_cache_load(diskcache);
soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache));
}
/* ssl */ /* ssl */
tlsdb = g_tls_file_database_new(cafile, &error); tlsdb = g_tls_file_database_new(cafile, &error);