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

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

1 files changed, 10 insertions, 8 deletions

diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index 65cc4e39a..9e966b96e 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -21,7 +21,6 @@
 #include "riscos/dialog.h"
 #include "riscos/gui.h"
 #include "riscos/menus.h"
-#include "riscos/options.h"
 #include "riscos/url_suggest.h"
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
@@ -46,9 +45,12 @@ bool ro_gui_options_home_initialise(wimp_w w)
 {
 	/* set the current values */
 	ro_gui_set_icon_string(w, HOME_URL_FIELD,
-			option_homepage_url ? option_homepage_url : "", true);
+                               nsoption_charp(homepage_url) ? 
+                               nsoption_charp(homepage_url) : "", true);
+
 	ro_gui_set_icon_selected_state(w, HOME_OPEN_STARTUP,
-			option_open_browser_at_startup);
+                                       nsoption_bool(open_browser_at_startup));
+
 	ro_gui_set_icon_shaded_state(w,
 			HOME_URL_GRIGHT, !ro_gui_url_suggest_prepare_menu());
 
@@ -78,11 +80,11 @@ void ro_gui_options_home_default(wimp_pointer *pointer)
 
 bool ro_gui_options_home_ok(wimp_w w)
 {
-  	if (option_homepage_url)
-  		free(option_homepage_url);
-  	option_homepage_url = strdup(ro_gui_get_icon_string(w, HOME_URL_FIELD));
-	option_open_browser_at_startup = ro_gui_get_icon_selected_state(w,
-			HOME_OPEN_STARTUP);
+	nsoption_set_charp(homepage_url,
+		       strdup(ro_gui_get_icon_string(w, HOME_URL_FIELD)));
+
+	nsoption_set_bool(open_browser_at_startup,
+			  ro_gui_get_icon_selected_state(w, HOME_OPEN_STARTUP));
 
 	ro_gui_save_options();
   	return true;