summaryrefslogtreecommitdiff
path: root/render/favicon.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-04-04 12:41:19 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-04-04 12:41:19 +0000
commit79ce683b4e6d34fe327b00f1e427e476016cfab0 (patch)
tree2ed3ba800e8f570000f97588ce668eb47168565a /render/favicon.c
parent3daffe3d6b07be7bbeedbcb2586f11edd872cbd6 (diff)
downloadnetsurf-79ce683b4e6d34fe327b00f1e427e476016cfab0.tar.gz
netsurf-79ce683b4e6d34fe327b00f1e427e476016cfab0.tar.bz2
Most of a stop implementation.
Remaining work: 1) Clone content_html_data 2) Cloning content_css_data requires the charset of the old content 3) Calling hlcache_handle_abort() before a content has been created must clean up the retrieval context. svn path=/trunk/netsurf/; revision=10236
Diffstat (limited to 'render/favicon.c')
-rw-r--r--render/favicon.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/render/favicon.c b/render/favicon.c
index 9f7ad7647..89b292528 100644
--- a/render/favicon.c
+++ b/render/favicon.c
@@ -195,9 +195,12 @@ nserror favicon_callback(hlcache_handle *icon,
if (*type == CONTENT_UNKNOWN) {
union content_msg_data msg_data;
- hlcache_handle_release(c->data.html.favicon);
- c->data.html.favicon = NULL;
LOG(("%s is not a favicon", content_get_url(icon)));
+
+ hlcache_handle_abort(icon);
+ hlcache_handle_release(icon);
+ c->data.html.favicon = NULL;
+
content_add_error(c, "NotFavIco", 0);
msg_data.error = messages_get("NotFavIco");