1 files changed, 27 insertions, 16 deletions

diff --git a/render/html_css.c b/render/html_css.c
index 4d5469361..45bc16f56 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -103,17 +103,23 @@ html_convert_css_callback(hlcache_handle *css,
 	switch (event->type) {
 
 	case CONTENT_MSG_DONE:
-		LOG("done stylesheet slot %d '%s'", i, nsurl_access(hlcache_handle_get_url(css)));
+		NSLOG(netsurf, INFO, "done stylesheet slot %d '%s'", i,
+		      nsurl_access(hlcache_handle_get_url(css)));
 		parent->base.active--;
-		LOG("%d fetches active", parent->base.active);
+		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
 		break;
 
 	case CONTENT_MSG_ERROR:
-		LOG("stylesheet %s failed: %s", nsurl_access(hlcache_handle_get_url(css)), event->data.error);
+		NSLOG(netsurf, INFO, "stylesheet %s failed: %s",
+		      nsurl_access(hlcache_handle_get_url(css)),
+		      event->data.error);
+		/* fall through */
+
+	case CONTENT_MSG_ERRORCODE:
 		hlcache_handle_release(css);
 		s->sheet = NULL;
 		parent->base.active--;
-		LOG("%d fetches active", parent->base.active);
+		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
 		content_add_error(&parent->base, "?", 0);
 		break;
 
@@ -150,7 +156,7 @@ html_stylesheet_from_domnode(html_content *c,
 
 	exc = dom_node_get_text_content(node, &style);
 	if ((exc != DOM_NO_ERR) || (style == NULL)) {
-		LOG("No text content");
+		NSLOG(netsurf, INFO, "No text content");
 		return NSERROR_OK;
 	}
 
@@ -181,7 +187,7 @@ html_stylesheet_from_domnode(html_content *c,
 	nsurl_unref(url);
 
 	c->base.active++;
-	LOG("%d fetches active", c->base.active);
+	NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
 
 	return NSERROR_OK;
 }
@@ -253,13 +259,14 @@ static bool html_css_process_modified_style(html_content *c,
 
 	error = html_stylesheet_from_domnode(c, s->node, &sheet);
 	if (error != NSERROR_OK) {
-		LOG("Failed to update sheet");
+		NSLOG(netsurf, INFO, "Failed to update sheet");
 		content_broadcast_errorcode(&c->base, error);
 		return false;
 	}
 
 	if (sheet != NULL) {
-		LOG("Updating sheet %p with %p", s->sheet, sheet);
+		NSLOG(netsurf, INFO, "Updating sheet %p with %p", s->sheet,
+		      sheet);
 
 		if (s->sheet != NULL) {
 			switch (content_get_status(s->sheet)) {
@@ -268,7 +275,8 @@ static bool html_css_process_modified_style(html_content *c,
 			default:
 				hlcache_handle_abort(s->sheet);
 				c->base.active--;
-				LOG("%d fetches active", c->base.active);
+				NSLOG(netsurf, INFO, "%d fetches active",
+				      c->base.active);
 			}
 			hlcache_handle_release(s->sheet);
 		}
@@ -313,7 +321,9 @@ bool html_css_update_style(html_content *c, dom_node *style)
 		s = html_create_style_element(c, style);
 	}
 	if (s == NULL) {
-		LOG("Could not find or create inline stylesheet for %p", style);
+		NSLOG(netsurf, INFO,
+		      "Could not find or create inline stylesheet for %p",
+		      style);
 		return false;
 	}
 
@@ -417,7 +427,8 @@ bool html_css_process_link(html_content *htmlc, dom_node *node)
 	}
 	dom_string_unref(href);
 
-	LOG("linked stylesheet %i '%s'", htmlc->stylesheet_count, nsurl_access(joined));
+	NSLOG(netsurf, INFO, "linked stylesheet %i '%s'",
+	      htmlc->stylesheet_count, nsurl_access(joined));
 
 	/* extend stylesheets array to allow for new sheet */
 	stylesheets = realloc(htmlc->stylesheets,
@@ -452,7 +463,7 @@ bool html_css_process_link(html_content *htmlc, dom_node *node)
 	htmlc->stylesheet_count++;
 
 	htmlc->base.active++;
-	LOG("%d fetches active", htmlc->base.active);
+	NSLOG(netsurf, INFO, "%d fetches active", htmlc->base.active);
 
 	return true;
 
@@ -517,7 +528,7 @@ nserror html_css_quirks_stylesheets(html_content *c)
 		}
 
 		c->base.active++;
-		LOG("%d fetches active", c->base.active);
+		NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
 	}
 
 	return ns_error;
@@ -561,7 +572,7 @@ nserror html_css_new_stylesheets(html_content *c)
 	}
 
 	c->base.active++;
-	LOG("%d fetches active", c->base.active);
+	NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
 
 
 	if (nsoption_bool(block_advertisements)) {
@@ -575,7 +586,7 @@ nserror html_css_new_stylesheets(html_content *c)
 		}
 
 		c->base.active++;
-		LOG("%d fetches active", c->base.active);
+		NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
 
 	}
 
@@ -588,7 +599,7 @@ nserror html_css_new_stylesheets(html_content *c)
 	}
 
 	c->base.active++;
-	LOG("%d fetches active", c->base.active);
+	NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
 
 	return ns_error;
 }