From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- desktop/searchweb.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'desktop/searchweb.c') diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 23c0d5027..496ec14e1 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -209,10 +209,7 @@ void search_web_retrieve_ico(bool localdefault) */ return; #else - static const content_type accept[] = { - CONTENT_ICO, - CONTENT_UNKNOWN - }; + content_type accept = CONTENT_IMAGE; char *url; nserror error; @@ -284,13 +281,7 @@ nserror search_web_ico_callback(hlcache_handle *ico, case CONTENT_MSG_DONE: LOG(("got favicon '%s'", content_get_url(ico))); - if (content_get_type(ico) == CONTENT_ICO) { - gui_window_set_search_ico(search_ico); - } else { - hlcache_handle_release(ico); - search_ico = NULL; - search_web_retrieve_ico(true); - } + gui_window_set_search_ico(search_ico); break; case CONTENT_MSG_ERROR: -- cgit v1.2.3