diff options
| author | Sven Weidauer <sven@5sw.de> | 2017-12-23 10:55:59 +0100 |
|---|---|---|
| committer | Sven Weidauer <sven@5sw.de> | 2017-12-23 10:55:59 +0100 |
| commit | cb452810b98273f1bf3275321386c8393d5c5134 (patch) | |
| tree | af32263647bad0f8573c93fd9e426aeec2a57057 /desktop/searchweb.c | |
| parent | d0549e7a5b14959097a1e8696dce1b1f40c6ba54 (diff) | |
| parent | 3c0ff81be45968e1c9d9b989243c975dfeab4cb0 (diff) | |
| download | netsurf-cb452810b98273f1bf3275321386c8393d5c5134.tar.gz netsurf-cb452810b98273f1bf3275321386c8393d5c5134.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into svenw/cocoa
Diffstat (limited to 'desktop/searchweb.c')
| -rw-r--r-- | desktop/searchweb.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 29a998eb2..c07cac9d5 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -289,13 +289,19 @@ search_web_ico_callback(hlcache_handle *ico, switch (event->type) { case CONTENT_MSG_DONE: - LOG("icon '%s' retrieved", nsurl_access(hlcache_handle_get_url(ico))); + NSLOG(netsurf, INFO, "icon '%s' retrieved", + nsurl_access(hlcache_handle_get_url(ico))); guit->search_web->provider_update(provider->name, content_get_bitmap(ico)); break; case CONTENT_MSG_ERROR: - LOG("icon %s error: %s", nsurl_access(hlcache_handle_get_url(ico)), event->data.error); + NSLOG(netsurf, INFO, "icon %s error: %s", + nsurl_access(hlcache_handle_get_url(ico)), + event->data.error); + /* fall through */ + + case CONTENT_MSG_ERRORCODE: hlcache_handle_release(ico); /* clear reference to released handle */ provider->ico_handle = NULL; @@ -438,7 +444,8 @@ default_ico_callback(hlcache_handle *ico, switch (event->type) { case CONTENT_MSG_DONE: - LOG("default icon '%s' retrieved", nsurl_access(hlcache_handle_get_url(ico))); + NSLOG(netsurf, INFO, "default icon '%s' retrieved", + nsurl_access(hlcache_handle_get_url(ico))); /* only set to default icon if providers icon has no handle */ if (ctx->providers[search_web_ctx.current].ico_handle == NULL) { @@ -449,7 +456,12 @@ default_ico_callback(hlcache_handle *ico, break; case CONTENT_MSG_ERROR: - LOG("icon %s error: %s", nsurl_access(hlcache_handle_get_url(ico)), event->data.error); + NSLOG(netsurf, INFO, "icon %s error: %s", + nsurl_access(hlcache_handle_get_url(ico)), + event->data.error); + /* fall through */ + + case CONTENT_MSG_ERRORCODE: hlcache_handle_release(ico); /* clear reference to released handle */ ctx->default_ico_handle = NULL; |