NetSurf options rework (a=vince r=daniels,jmb)

svn path=/trunk/netsurf/; revision=13548

1 files changed, 7 insertions, 6 deletions

diff --git a/render/box_construct.c b/render/box_construct.c
index 4b280fbe9..b53328d1f 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -404,9 +404,9 @@ static bool box_construct_marker(struct box *box, const char *title,
 		break;
 	}
 
-	if (css_computed_list_style_image(box->style, &image_uri) ==
-			CSS_LIST_STYLE_IMAGE_URI && image_uri != NULL &&
-			option_foreground_images == true) {
+	if (css_computed_list_style_image(box->style, &image_uri) == CSS_LIST_STYLE_IMAGE_URI && 
+	    (image_uri != NULL) &&
+	    (nsoption_bool(foreground_images) == true)) {
 		nsurl *url;
 		nserror error;
 
@@ -712,7 +712,7 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 	/* Kick off fetch for any background image */
 	if (css_computed_background_image(box->style, &bgimage_uri) == 
 			CSS_BACKGROUND_IMAGE_IMAGE && bgimage_uri != NULL &&
-			option_background_images == true) {
+	    nsoption_bool(background_images) == true) {
 		nsurl *url;
 		nserror error;
 
@@ -1380,8 +1380,9 @@ bool box_image(BOX_SPECIAL_PARAMS)
 		box->length = strlen(box->text);
 	}
 
-	if (option_foreground_images == false)
+	if (nsoption_bool(foreground_images) == false) {
 		return true;
+	}
 
 	/* imagemap associated with this image */
 	if (!box_get_attribute(n, "usemap", content, &box->usemap))
@@ -2041,7 +2042,7 @@ bool box_input(BOX_SPECIAL_PARAMS)
 
 		if (box->style && css_computed_display(box->style,
 				n->parent == NULL) != CSS_DISPLAY_NONE &&
-				option_foreground_images == true) {
+		    nsoption_bool(foreground_images) == true) {
 			if ((s = (char *) xmlGetProp(n,
 					(const xmlChar*) "src"))) {
 				error = nsurl_join(content->base_url, s, &url);