tDisk cache is now handled through WebKit - surf - customized build of surf, th… | |
git clone git://src.adamsgaard.dk/surf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit e39b7e623cb19dc5e7e294d2e1a137a95dfd6945 | |
parent 7c34b37786fede614767d738080dffc1cf66ff61 | |
Author: Quentin Rameau <[email protected]> | |
Date: Wed, 18 Nov 2015 15:10:42 +0100 | |
Disk cache is now handled through WebKit | |
Diffstat: | |
M surf.c | 23 +++-------------------- | |
1 file changed, 3 insertions(+), 20 deletions(-) | |
--- | |
diff --git a/surf.c b/surf.c | |
t@@ -96,7 +96,6 @@ static char pagestat[3]; | |
static GTlsDatabase *tlsdb; | |
static int cookiepolicy; | |
static char *stylefile = NULL; | |
-static SoupCache *diskcache = NULL; | |
static void addaccelgroup(Client *c); | |
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f, | |
t@@ -328,10 +327,6 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Clie… | |
void | |
cleanup(void) | |
{ | |
- if (diskcache) { | |
- soup_cache_flush(diskcache); | |
- soup_cache_dump(diskcache); | |
- } | |
while (clients) | |
destroyclient(clients); | |
g_free(cookiefile); | |
t@@ -730,10 +725,6 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, … | |
case WEBKIT_LOAD_FINISHED: | |
c->progress = 100; | |
updatetitle(c); | |
- if (diskcache) { | |
- soup_cache_flush(diskcache); | |
- soup_cache_dump(diskcache); | |
- } | |
break; | |
default: | |
break; | |
t@@ -1211,7 +1202,6 @@ setup(void) | |
{ | |
int i; | |
char *styledirfile, *stylepath; | |
- SoupSession *s; | |
WebKitWebContext *context; | |
GError *error = NULL; | |
t@@ -1255,9 +1245,6 @@ setup(void) | |
g_free(stylepath); | |
} | |
- /* request handler */ | |
- s = webkit_get_default_session(); | |
- | |
/* cookie policy */ | |
webkit_cookie_manager_set_persistent_storage( | |
webkit_web_context_get_cookie_manager(context), cookiefile, | |
t@@ -1267,13 +1254,9 @@ setup(void) | |
cookiepolicy_get()); | |
/* disk cache */ | |
- if (enablediskcache) { | |
- diskcache = soup_cache_new(cachefolder, | |
- SOUP_CACHE_SINGLE_USER); | |
- soup_cache_set_max_size(diskcache, diskcachebytes); | |
- soup_cache_load(diskcache); | |
- soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache)); | |
- } | |
+ webkit_web_context_set_cache_model(context, enablecache ? | |
+ WEBKIT_CACHE_MODEL_WEB_BROWSER : | |
+ WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); | |
/* ssl */ | |
tlsdb = g_tls_file_database_new(cafile, &error); |