From 2538d05bb4b04b0c438e303e8bd67aec28bd3506 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 21 Aug 2019 20:50:54 +0100 Subject: browser: Turn internal nav URLs into corestring_nsurls Signed-off-by: Daniel Silverstone --- desktop/browser_window.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'desktop/browser_window.c') diff --git a/desktop/browser_window.c b/desktop/browser_window.c index 95131d1ac..adcc8f0b7 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -1026,10 +1026,7 @@ browser_window__handle_login(struct browser_window *bw, } /* Step two, construct our fetch parameters */ - err = nsurl_create("about:query/auth", ¶ms.url); - if (err != NSERROR_OK) { - goto out; - } + params.url = nsurl_ref(corestring_nsurl_about_query_auth); params.referrer = nsurl_ref(url); params.flags = BW_NAVIGATE_HISTORY | BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL; @@ -1101,10 +1098,7 @@ browser_window__handle_bad_certs(struct browser_window *bw, memset(¶ms, 0, sizeof(params)); - err = nsurl_create("about:query/ssl", ¶ms.url); - if (err != NSERROR_OK) { - goto out; - } + params.url = nsurl_ref(corestring_nsurl_about_query_ssl); err = fetch_multipart_data_new_kv(¶ms.post_multipart, "siteurl", @@ -1679,8 +1673,6 @@ browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url) return NSERROR_OK; } - NSLOG(netsurf, CRITICAL, "Updating the URL to %s", nsurl_access(url)); - return guit->window->set_url(bw->window, url); } @@ -3380,10 +3372,7 @@ browser_window__navigate_internal_query_auth(struct browser_window *bw, * about:blank */ browser_window__free_fetch_parameters(&bw->loading_parameters); - res = nsurl_create("about:blank", &bw->loading_parameters.url); - if (res != NSERROR_OK) { - return res; - } + bw->loading_parameters.url = nsurl_ref(corestring_nsurl_about_blank); bw->loading_parameters.flags = BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL; bw->internal_nav = true; return browser_window__navigate_internal(bw, &bw->loading_parameters); -- cgit v1.2.3