From 1490b52a6b96b6a69a0c4fe9e0515dc717425128 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 22 Mar 2012 09:34:34 +0000
Subject: NetSurf options rework (a=vince r=daniels,jmb)

svn path=/trunk/netsurf/; revision=13548
---
 riscos/iconbar.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'riscos/iconbar.c')

diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index 85ca59155..9e3a050e1 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -37,7 +37,7 @@
 #include "riscos/global_history.h"
 #include "riscos/hotlist.h"
 #include "riscos/iconbar.h"
-#include "riscos/options.h"
+#include "desktop/options.h"
 #include "riscos/wimp_event.h"
 #include "utils/log.h"
 #include "utils/utils.h"
@@ -122,13 +122,13 @@ bool ro_gui_iconbar_click(wimp_pointer *pointer)
 
 	switch (pointer->buttons) {
 	case wimp_CLICK_SELECT:
-		if (option_homepage_url && option_homepage_url[0]) {
-			browser_window_create(option_homepage_url, NULL, 0,
-					true, false);
+		if (nsoption_charp(homepage_url) != NULL) {
+			browser_window_create(nsoption_charp(homepage_url), 
+					      NULL, 0, true, false);
 		} else {
 			snprintf(url, sizeof url,
-					"file:///<NetSurf$Dir>/Docs/welcome/index_%s",
-					option_language);
+				 "file:///<NetSurf$Dir>/Docs/welcome/index_%s",
+				 nsoption_charp(language));
 			browser_window_create(url, NULL, 0, true, false);
 		}
 		break;
-- 
cgit v1.2.3