eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

browser: Turn internal nav URLs into corestring_nsurls 

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-08-21 20:50:54 +01:00
parent b67bbe3280
commit 2538d05bb4
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
desktop/browser_window.c
View File

@ -1026,10 +1026,7 @@ browser_window__handle_login(struct browser_window *bw,
}
/* Step two, construct our fetch parameters */
err = nsurl_create("about:query/auth", &params.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(&params, 0, sizeof(params));
err = nsurl_create("about:query/ssl", &params.url);
if (err != NSERROR_OK) {
goto out;
}
params.url = nsurl_ref(corestring_nsurl_about_query_ssl);
err = fetch_multipart_data_new_kv(&params.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);

2
utils/corestringlist.h
View File

@ -358,6 +358,8 @@ CORESTRING_DOM_VALUE(http_equiv, "http-equiv");
CORESTRING_DOM_VALUE(html_namespace, "http://www.w3.org/1999/xhtml");
CORESTRING_NSURL(about_blank, "about:blank");
CORESTRING_NSURL(about_query_ssl, "about:query/ssl");
CORESTRING_NSURL(about_query_auth, "about:query/auth");
#undef CORESTRING_LWC_STRING
#undef CORESTRING_DOM_STRING