move gtk frontend to use new options API

1 files changed, 43 insertions, 23 deletions

diff --git a/gtk/gui.c b/gtk/gui.c
index 657770db6..ac743c5d0 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -241,8 +241,13 @@ nsgtk_init_glade(char **respath)
 	widWarning = GTK_WIDGET(gtk_builder_get_object(gladeWarning, "labelWarning"));
 }
 
-/* Documented in utils/nsoption.h */
-void gui_options_init_defaults(void)
+/**
+ * Set option defaults for gtk frontend
+ *
+ * @param defaults The option table to update.
+ * @return error status.
+ */
+static nserror set_defaults(struct nsoption_s *defaults)
 {
 	char *hdir = getenv("HOME");
 	char buf[PATH_MAX];
@@ -252,8 +257,10 @@ void gui_options_init_defaults(void)
 	nsoption_setnull_charp(cookie_file, strdup(buf));
 	nsoption_setnull_charp(cookie_jar, strdup(buf));
 	if (nsoption_charp(cookie_file) == NULL ||
-			nsoption_charp(cookie_jar) == NULL)
-		die("Failed initialising cookie options");
+	    nsoption_charp(cookie_jar) == NULL) {
+		LOG(("Failed initialising cookie options"));
+		return NSERROR_BAD_PARAMETER;
+	}
 
 	if (nsoption_charp(downloads_directory) == NULL) {
 		snprintf(buf, PATH_MAX, "%s/", hdir);
@@ -276,8 +283,18 @@ void gui_options_init_defaults(void)
 			nsoption_charp(ca_path) == NULL ||
 			nsoption_charp(downloads_directory) == NULL ||
 			nsoption_charp(hotlist_path) == NULL) {
-		die("Failed initialising string options");
+		LOG(("Failed initialising string options"));
+		return NSERROR_BAD_PARAMETER;
 	}
+
+	/* set default font names */
+	nsoption_set_charp(font_sans, strdup("Sans"));
+	nsoption_set_charp(font_serif, strdup("Serif"));
+	nsoption_set_charp(font_mono, strdup("Monospace"));
+	nsoption_set_charp(font_cursive, strdup("Serif"));
+	nsoption_set_charp(font_fantasy, strdup("Serif"));
+
+	return NSERROR_OK;
 }
 
 static void check_options(char **respath)
@@ -308,15 +325,6 @@ static void check_options(char **respath)
 	LOG(("Using '%s' as Print Settings file", buf));
 	print_options_file_location = strdup(buf);
 
-	/* check what the font settings are, setting them to a default font
-	 * if they're not set - stops Pango whinging
-	 */
-#define SETFONTDEFAULT(OPTION,y) if (nsoption_charp(OPTION) == NULL) nsoption_set_charp(OPTION, strdup((y)))
-	SETFONTDEFAULT(font_sans, "Sans");
-	SETFONTDEFAULT(font_serif, "Serif");
-	SETFONTDEFAULT(font_mono, "Monospace");
-	SETFONTDEFAULT(font_cursive, "Serif");
-	SETFONTDEFAULT(font_fantasy, "Serif");
 
 }
 
@@ -355,9 +363,6 @@ static void gui_init(int argc, char** argv, char **respath)
 	nsurl *url;
 	nserror error;
 
-	/* check user options */
-	check_options(respath);
-
 	/* find the languages file */	
 	languages_file_location = filepath_find(respath, "languages");
 	if ((languages_file_location == NULL) || 
@@ -532,6 +537,7 @@ int main(int argc, char** argv)
 {
 	char *messages;
 	char *options;
+	nserror ret;
 
 	/* check home directory is available */
 	nsgtk_check_homedir();
@@ -540,25 +546,39 @@ int main(int argc, char** argv)
 
 	gtk_init(&argc, &argv);
 	
-	options = filepath_find(respaths, "Choices");
-	messages = filepath_find(respaths, "Messages");
-
 	/* initialise logging. Not fatal if it fails but not much we
 	 * can do about it either.
 	 */
 	nslog_init(nslog_stream_configure, &argc, argv);
 
-	netsurf_init(&argc, &argv, options, messages);
+	/* user options setup */
+	ret = nsoption_init(set_defaults, &nsoptions, &nsoptions_default);
+	if (ret != NSERROR_OK) {
+		die("Options failed to initialise");
+	}
+	options = filepath_find(respaths, "Choices");
+	nsoption_read(options, NULL);
+	free(options);
+	nsoption_commandline(&argc, argv, NULL);
+	check_options(respaths); /* check user options */
 
+	/* common initialisation */
+	messages = filepath_find(respaths, "Messages");
+	ret = netsurf_init(messages);
 	free(messages);
-	free(options);
+	if (ret != NSERROR_OK) {
+		die("NetSurf failed to initialise");
+	}
 
+	/* run the browser */
 	gui_init(argc, argv, respaths);
 
 	/* Ensure all scaffoldings are destroyed before we go into exit */
-	while (scaf_list != NULL)
+	while (scaf_list != NULL) {
 		nsgtk_scaffolding_destroy(scaf_list);
+	}
 	
+	/* common finalisation */
 	netsurf_exit();
 
 	return 0;