diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
commit | ddeadd1c02880367ad786b113d352a519f45ec73 (patch) | |
tree | 00b8b46ee1a3fc84e5492c2183dfaa8192d261f9 /content/fetchcache.c | |
parent | b20949a35025b23da1bf0ac6003f4575eb94281d (diff) | |
download | netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.gz netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.bz2 |
Merge LibCSS port to trunk.
svn path=/trunk/netsurf/; revision=8752
Diffstat (limited to 'content/fetchcache.c')
-rw-r--r-- | content/fetchcache.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/fetchcache.c b/content/fetchcache.c index cb5cc9132..71e39e4fa 100644 --- a/content/fetchcache.c +++ b/content/fetchcache.c @@ -409,6 +409,7 @@ void fetchcache_callback(fetch_msg msg, void *p, const void *data, content_type type; char *mime_type; char **params; + struct content *parent; unsigned int i; union content_msg_data msg_data; @@ -426,9 +427,11 @@ void fetchcache_callback(fetch_msg msg, void *p, const void *data, return; } type = content_lookup(mime_type); + parent = fetch_get_parent(c->fetch); res = content_set_type(c, c->download ? CONTENT_OTHER : type, - mime_type, (const char **) params); + mime_type, (const char **) params, + parent); free(mime_type); for (i = 0; params[i]; i++) free(params[i]); @@ -734,7 +737,7 @@ void fetchcache_error_page(struct content *c, const char *error) if ((length = snprintf(error_page, sizeof(error_page), messages_get("ErrorPage"), error)) < 0) length = 0; - if (!content_set_type(c, CONTENT_HTML, "text/html", params)) + if (!content_set_type(c, CONTENT_HTML, "text/html", params, NULL)) return; if (!content_process_data(c, error_page, length)) return; |