From 3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 14 Feb 2013 15:09:28 +0000
Subject: browser_window_navigate refactor

---
 monkey/browser.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'monkey')

diff --git a/monkey/browser.c b/monkey/browser.c
index e6a57d00b..a4a923fac 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -431,9 +431,32 @@ monkey_window_handle_go(int argc, char **argv)
   if (gw == NULL) {
     fprintf(stdout, "ERROR WINDOW NUM BAD\n");
   } else {
-    browser_window_go(gw->bw, argv[3], (argc == 5) ? argv[4] : NULL, true);
+    nsurl *url;
+    nsurl *ref_url = NULL;
+    nserror error;
+
+    error = nsurl_create(argv[3], &url);
+    if (error != NSERROR_OK) {
+      warn_user(messages_get_errorcode(error), 0);
+    } else {
+      if (argc == 5) {
+	error = nsurl_create(argv[4], &ref_url);
+      }
+
+      browser_window_navigate(gw->bw,
+			      url,
+			      ref_url,
+			      BROWSER_WINDOW_GO_FLAG_HISTORY |
+			      BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+			      NULL,
+			      NULL,
+			      NULL);
+      nsurl_unref(url);
+      if (ref_url != NULL) {
+	nsurl_unref(ref_url);
+      }
+    }
   }
-
 }
 
 static void
-- 
cgit v1.2.3