diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /desktop/searchweb.c | |
parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'desktop/searchweb.c')
-rw-r--r-- | desktop/searchweb.c | 13 |
1 files changed, 2 insertions, 11 deletions
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: |