From b112dec78d5e8289ded3f61db96e495690ae96b5 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 14 Feb 2013 18:21:11 +0000
Subject: change browser_window_create and refactor all callsites

---
 atari/gui.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'atari/gui.c')

diff --git a/atari/gui.c b/atari/gui.c
index a59caa8e5..4a0c70537 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -1027,6 +1027,9 @@ static void gui_init2(int argc, char** argv)
 int main(int argc, char** argv)
 {
     char messages[PATH_MAX];
+	const char *addr;
+	nsurl *url;
+	nserror error;
 
     setbuf(stderr, NULL);
     setbuf(stdout, NULL);
@@ -1056,10 +1059,29 @@ int main(int argc, char** argv)
     graf_mouse( ARROW , NULL);
 
     LOG(("Creating initial browser window..."));
-    browser_window_create(option_homepage_url, 0, 0, true, false);
-
-    LOG(("Entering NetSurf mainloop..."));
-    netsurf_main_loop();
+    if (nsoption_charp(homepage_url) != NULL) {
+		addr = nsoption_charp(homepage_url);
+	} else {
+		addr = NETSURF_HOMEPAGE;
+	}
+
+	/* create an initial browser window */
+	error = nsurl_create(addr, &url);
+	if (error == NSERROR_OK) {
+		error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
+					      BROWSER_WINDOW_GO_FLAG_HISTORY,
+					      url,
+					      NULL,
+					      NULL,
+					      NULL);
+		nsurl_unref(url);
+	}
+	if (error != NSERROR_OK) {
+		warn_user(messages_get_errorcode(error), 0);
+	} else {
+		LOG(("Entering NetSurf mainloop..."));
+		netsurf_main_loop();
+	}
 
     netsurf_exit();
     LOG(("ApplExit"));
-- 
cgit v1.2.3