diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 15:56:47 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 15:56:47 +0000 |
| commit | 36eff6da2bfe5b183c2b4876bb2afe9dedec9b39 (patch) | |
| tree | 6cc96c71499d22745947113db5c6fc118c286d1f /desktop/searchweb.c | |
| parent | a595d7c4bbe44f7de6c565a4fbbdcff735f0ce99 (diff) | |
| download | netsurf-36eff6da2bfe5b183c2b4876bb2afe9dedec9b39.tar.gz netsurf-36eff6da2bfe5b183c2b4876bb2afe9dedec9b39.tar.bz2 | |
Port more internals to nsurl. Front ends may need updating.
svn path=/trunk/netsurf/; revision=12926
Diffstat (limited to 'desktop/searchweb.c')
| -rw-r--r-- | desktop/searchweb.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 0313859e0..b4493ab31 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -212,6 +212,7 @@ void search_web_retrieve_ico(bool localdefault) content_type accept = CONTENT_IMAGE; char *url; nserror error; + nsurl *icon_nsurl; if (localdefault) { if (search_default_ico_location == NULL) @@ -233,9 +234,19 @@ void search_web_retrieve_ico(bool localdefault) return; } - error = hlcache_handle_retrieve(url, 0, NULL, NULL, + error = nsurl_create(url, &icon_nsurl); + if (error != NSERROR_OK) { + free(url); + search_ico = NULL; + return; + } + + error = hlcache_handle_retrieve(icon_nsurl, 0, NULL, NULL, search_web_ico_callback, NULL, NULL, accept, &search_ico); + + nsurl_unref(icon_nsurl); + if (error != NSERROR_OK) search_ico = NULL; @@ -280,13 +291,14 @@ nserror search_web_ico_callback(hlcache_handle *ico, break; case CONTENT_MSG_DONE: - LOG(("got favicon '%s'", content_get_url(ico))); + LOG(("got favicon '%s'", nsurl_access(content_get_url(ico)))); gui_window_set_search_ico(search_ico); break; case CONTENT_MSG_ERROR: LOG(("favicon %s error: %s", - content_get_url(ico), event->data.error)); + nsurl_access(content_get_url(ico)), + event->data.error)); hlcache_handle_release(search_ico); search_ico = NULL; search_web_retrieve_ico(true); |