From ddeadd1c02880367ad786b113d352a519f45ec73 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 23 Jul 2009 23:05:34 +0000
Subject: Merge LibCSS port to trunk.

svn path=/trunk/netsurf/; revision=8752
---
 amiga/save_complete.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'amiga/save_complete.c')

diff --git a/amiga/save_complete.c b/amiga/save_complete.c
index 26b55adf5..2f5ebd584 100755
--- a/amiga/save_complete.c
+++ b/amiga/save_complete.c
@@ -120,17 +120,20 @@ bool save_complete_html(struct content *c, const char *path, bool index)
 		return true;
 
 	/* save stylesheets, ignoring the base and adblocking sheets */
-	for (i = STYLESHEET_STYLE; i != c->data.html.stylesheet_count; i++) {
+	for (i = STYLESHEET_START; i != c->data.html.stylesheet_count; i++) {
 		struct content *css = c->data.html.stylesheet_content[i];
 		char *source;
 		int source_len;
+		bool is_style;
 
 		if (!css)
 			continue;
 		if (save_complete_list_check(css))
 			continue;
 
-		if (i != STYLESHEET_STYLE) {
+		is_style = (strcmp(css->url, c->data.html.base_url) == 0);
+
+		if (is_style == false) {
 			if (!save_complete_list_add(css)) {
 				warn_user("NoMemory", 0);
 				return false;
@@ -140,7 +143,7 @@ bool save_complete_html(struct content *c, const char *path, bool index)
 		if (!save_imported_sheets(css, path))
 			return false;
 
-		if (i == STYLESHEET_STYLE)
+		if (is_style)
 			continue; /* don't save <style> elements */
 
 		snprintf(spath, sizeof spath, "%s/%x", path,
@@ -317,7 +320,7 @@ bool save_imported_sheets(struct content *c, const char *path)
 	BPTR fh = 0;
 
 	for (j = 0; j != c->data.css.import_count; j++) {
-		struct content *css = c->data.css.import_content[j];
+		struct content *css = c->data.css.imports[j];
 
 		if (!css)
 			continue;
-- 
cgit v1.2.3