Make browser_window_navigate (un)verifiable flag match browser_window_create.

This commit is contained in:
Michael Drake 2014-02-10 22:40:04 +00:00
parent 76b5378996
commit 49bed056dd
29 changed files with 90 additions and 129 deletions

View File

@ -248,8 +248,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(curbw, browser_window_navigate(curbw,
url, url,
NULL, NULL,
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -279,8 +278,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -507,8 +505,7 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -820,8 +820,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
hlcache_handle_get_url(gwin->bw->current_content), hlcache_handle_get_url(gwin->bw->current_content),
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -835,8 +834,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
hlcache_handle_get_url(userdata), hlcache_handle_get_url(userdata),
hlcache_handle_get_url(gwin->bw->current_content), hlcache_handle_get_url(gwin->bw->current_content),
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -852,8 +850,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
hlcache_handle_get_url(gwin->bw->current_content), hlcache_handle_get_url(gwin->bw->current_content),
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -928,8 +925,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -999,8 +995,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -274,8 +274,7 @@ static void gui_download_window_done(struct gui_download_window *dw)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -104,8 +104,7 @@ void ami_file_open(struct gui_window_2 *gwin)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -1799,8 +1799,7 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1826,8 +1825,7 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1844,8 +1842,7 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -2326,8 +2323,7 @@ void ami_handle_appmsg(void)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -4914,8 +4910,7 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -1034,8 +1034,7 @@ static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -322,8 +322,7 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y)
browser_window_navigate(gwin->bw, browser_window_navigate(gwin->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -238,8 +238,7 @@ void context_popup(struct gui_window * gw, short x, short y)
gw->browser->bw, gw->browser->bw,
hlcache_handle_get_url(ctx->ccdata.object), hlcache_handle_get_url(ctx->ccdata.object),
hlcache_handle_get_url(gw->browser->bw->current_content), hlcache_handle_get_url(gw->browser->bw->current_content),
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -258,8 +257,7 @@ void context_popup(struct gui_window * gw, short x, short y)
gw->browser->bw, gw->browser->bw,
url, url,
hlcache_handle_get_url(gw->browser->bw->current_content), hlcache_handle_get_url(gw->browser->bw->current_content),
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL NULL

View File

@ -1537,7 +1537,7 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8])
if ((tmp_url != NULL) if ((tmp_url != NULL)
&& nsurl_create(tmp_url, &ns_url) == NSERROR_OK) { && nsurl_create(tmp_url, &ns_url) == NSERROR_OK) {
browser_window_navigate(gw->browser->bw, ns_url, NULL, browser_window_navigate(gw->browser->bw, ns_url, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE, BW_NAVIGATE_HISTORY,
NULL, NULL, NULL); NULL, NULL, NULL);
nsurl_unref(ns_url); nsurl_unref(ns_url);
} }

View File

@ -715,7 +715,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
warn_user("NoMemory", 0); warn_user("NoMemory", 0);
} else { } else {
browser_window_navigate(gw->browser->bw, url, NULL, browser_window_navigate(gw->browser->bw, url, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE, BW_NAVIGATE_HISTORY,
NULL, NULL, NULL); NULL, NULL, NULL);
nsurl_unref(url); nsurl_unref(url);
} }
@ -1001,8 +1001,7 @@ void toolbar_home_click(struct s_toolbar *tb)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -888,7 +888,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
if (/*message->WasDropped() &&*/ i == 0) { if (/*message->WasDropped() &&*/ i == 0) {
browser_window_navigate(bw, nsurl, NULL, browser_window_navigate(bw, nsurl, NULL,
(browser_window_nav_flags) (browser_window_nav_flags)
(BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE), (BW_NAVIGATE_HISTORY),
NULL, NULL, NULL); NULL, NULL, NULL);
} else { } else {
error = browser_window_create(BW_CREATE_CLONE, error = browser_window_create(BW_CREATE_CLONE,
@ -949,7 +949,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw, browser_window_navigate(bw,
nsurl, nsurl,
NULL, NULL,
(browser_window_nav_flags)(BW_NAVIGATE_HISTORY), (browser_window_nav_flags)(BW_NAVIGATE_HISTORY | BW_NAVIGATE_UNVERIFIABLE),
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1019,8 +1019,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
(browser_window_nav_flags)(BW_NAVIGATE_HISTORY | (browser_window_nav_flags)(BW_NAVIGATE_HISTORY),
BW_NAVIGATE_VERIFIABLE),
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1048,8 +1047,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
(browser_window_nav_flags)(BW_NAVIGATE_HISTORY | (browser_window_nav_flags)(BW_NAVIGATE_HISTORY),
BW_NAVIGATE_VERIFIABLE),
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1268,7 +1266,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
if (nserr == NSERROR_OK) { if (nserr == NSERROR_OK) {
nserr = browser_window_navigate(bw, nserr = browser_window_navigate(bw,
url, NULL, url, NULL,
(browser_window_nav_flags)(BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE), (browser_window_nav_flags)(BW_NAVIGATE_HISTORY),
NULL, NULL, NULL); NULL, NULL, NULL);
nsurl_unref(url); nsurl_unref(url);
} }

View File

@ -142,8 +142,7 @@ static const char *cocoa_hotlist_path( void )
error = browser_window_navigate([tab browser], error = browser_window_navigate([tab browser],
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -623,8 +623,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser, browser_window_navigate(browser,
url, url,
NULL, NULL,
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -688,8 +687,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser, browser_window_navigate(browser,
url, url,
NULL, NULL,
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -755,8 +755,8 @@ nserror browser_window_create(enum browser_window_create_flags flags,
if (url != NULL) { if (url != NULL) {
enum browser_window_nav_flags nav_flags = BW_NAVIGATE_NONE; enum browser_window_nav_flags nav_flags = BW_NAVIGATE_NONE;
if (!(flags & BW_CREATE_UNVERIFIABLE)) if (flags & BW_CREATE_UNVERIFIABLE)
nav_flags |= BW_NAVIGATE_VERIFIABLE; nav_flags |= BW_NAVIGATE_UNVERIFIABLE;
if (flags & BW_CREATE_HISTORY) if (flags & BW_CREATE_HISTORY)
nav_flags |= BW_NAVIGATE_HISTORY; nav_flags |= BW_NAVIGATE_HISTORY;
browser_window_navigate(ret, url, referrer, nav_flags, NULL, browser_window_navigate(ret, url, referrer, nav_flags, NULL,
@ -1109,7 +1109,7 @@ static void browser_window_refresh(void *p)
nsurl *url; nsurl *url;
nsurl *refresh; nsurl *refresh;
hlcache_handle *parent = NULL; hlcache_handle *parent = NULL;
enum browser_window_nav_flags flags = BW_NAVIGATE_NONE; enum browser_window_nav_flags flags = BW_NAVIGATE_UNVERIFIABLE;
assert(bw->current_content != NULL && assert(bw->current_content != NULL &&
(content_get_status(bw->current_content) == (content_get_status(bw->current_content) ==
@ -1139,7 +1139,7 @@ static void browser_window_refresh(void *p)
* all. * all.
*/ */
if (bw->refresh_interval <= 100 && bw->parent == NULL) { if (bw->refresh_interval <= 100 && bw->parent == NULL) {
flags |= BW_NAVIGATE_VERIFIABLE; flags &= ~BW_NAVIGATE_UNVERIFIABLE;
} else { } else {
parent = bw->current_content; parent = bw->current_content;
} }
@ -1812,7 +1812,7 @@ nserror browser_window_navigate(struct browser_window *bw,
} }
/* Set up retrieval parameters */ /* Set up retrieval parameters */
if ((flags & BW_NAVIGATE_VERIFIABLE) != 0) { if (!(flags & BW_NAVIGATE_UNVERIFIABLE)) {
fetch_flags |= LLCACHE_RETRIEVE_VERIFIABLE; fetch_flags |= LLCACHE_RETRIEVE_VERIFIABLE;
} }
@ -1905,7 +1905,7 @@ nserror browser_window_navigate(struct browser_window *bw,
bw->history_add = (flags & BW_NAVIGATE_HISTORY); bw->history_add = (flags & BW_NAVIGATE_HISTORY);
/* Verifiable fetches may trigger a download */ /* Verifiable fetches may trigger a download */
if ((flags & BW_NAVIGATE_VERIFIABLE) != 0) { if (!(flags & BW_NAVIGATE_UNVERIFIABLE)) {
fetch_flags |= HLCACHE_RETRIEVE_MAY_DOWNLOAD; fetch_flags |= HLCACHE_RETRIEVE_MAY_DOWNLOAD;
} }
@ -2268,7 +2268,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
browser_window_navigate(bw, browser_window_navigate(bw,
hlcache_handle_get_url(bw->current_content), hlcache_handle_get_url(bw->current_content),
NULL, NULL,
BW_NAVIGATE_VERIFIABLE, BW_NAVIGATE_NONE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -76,7 +76,15 @@ enum browser_window_create_flags {
/** New gui_window to be clone of "existing" gui_window */ /** New gui_window to be clone of "existing" gui_window */
BW_CREATE_CLONE = (1 << 2), BW_CREATE_CLONE = (1 << 2),
/** Window not opened by user interaction (e.g. JS popup) */ /** Window not opened by user interaction (e.g. JS popup)
*
* rfc2965:
* A transaction is verifiable if the user, or a
* user-designated agent, has the option to review
* the request-URI prior to its use in the transaction.
* A transaction is unverifiable if the user does not
* have that option.
*/
BW_CREATE_UNVERIFIABLE = (1 << 3), BW_CREATE_UNVERIFIABLE = (1 << 3),
}; };
@ -91,8 +99,16 @@ enum browser_window_nav_flags {
/** download rather than render the uri */ /** download rather than render the uri */
BW_NAVIGATE_DOWNLOAD = (1 << 1), BW_NAVIGATE_DOWNLOAD = (1 << 1),
/** this transaction is verifiable */ /** Transation not caused by user interaction (e.g. JS-caused)
BW_NAVIGATE_VERIFIABLE = (1 << 2) *
* rfc2965:
* A transaction is verifiable if the user, or a
* user-designated agent, has the option to review
* the request-URI prior to its use in the transaction.
* A transaction is unverifiable if the user does not
* have that option.
*/
BW_NAVIGATE_UNVERIFIABLE = (1 << 2)
}; };
/** /**

View File

@ -252,7 +252,7 @@ void browser_window_create_iframes(struct browser_window *bw,
browser_window_navigate(window, browser_window_navigate(window,
cur->url, cur->url,
hlcache_handle_get_url(bw->current_content), hlcache_handle_get_url(bw->current_content),
BW_NAVIGATE_NONE, BW_NAVIGATE_UNVERIFIABLE,
NULL, NULL,
NULL, NULL,
bw->current_content); bw->current_content);
@ -389,7 +389,8 @@ void browser_window_create_frameset(struct browser_window *bw,
browser_window_navigate(window, browser_window_navigate(window,
frame->url, frame->url,
hlcache_handle_get_url(parent), hlcache_handle_get_url(parent),
BW_NAVIGATE_HISTORY, BW_NAVIGATE_HISTORY |
BW_NAVIGATE_UNVERIFIABLE,
NULL, NULL,
NULL, NULL,
parent); parent);

View File

@ -463,7 +463,7 @@ void history_go(struct history *history, struct history_entry *entry,
} else { } else {
history->current = entry; history->current = entry;
browser_window_navigate(history->bw, url, NULL, browser_window_navigate(history->bw, url, NULL,
BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); BW_NAVIGATE_NONE, NULL, NULL, NULL);
} }
nsurl_unref(url); nsurl_unref(url);

View File

@ -1094,14 +1094,8 @@ fb_url_enter(void *pw, char *text)
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0); warn_user(messages_get_errorcode(error), 0);
} else { } else {
browser_window_navigate(bw, browser_window_navigate(bw, url, NULL, BW_NAVIGATE_HISTORY,
url, NULL, NULL, NULL);
NULL,
BW_NAVIGATE_HISTORY |
BW_NAVIGATE_VERIFIABLE,
NULL,
NULL,
NULL);
nsurl_unref(url); nsurl_unref(url);
} }

View File

@ -37,8 +37,7 @@ nsgtk_about_dialog_credits(GtkWidget *button, gpointer data)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -60,8 +59,7 @@ nsgtk_about_dialog_licence(GtkWidget *button, gpointer data)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -437,8 +437,7 @@ gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -550,8 +549,7 @@ static void nsgtk_openfile_open(const char *filename)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -959,8 +957,7 @@ MENUHANDLER(savelink)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1459,8 +1456,7 @@ MULTIHANDLER(home)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1576,8 +1572,7 @@ MULTIHANDLER(contents)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1598,8 +1593,7 @@ MULTIHANDLER(guide)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1620,8 +1614,7 @@ MULTIHANDLER(info)
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -62,8 +62,7 @@ operation assign %{
browser_window_navigate(bw, browser_window_navigate(bw,
joined, joined,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -84,7 +83,7 @@ operation replace %{
browser_window_navigate(bw, browser_window_navigate(bw,
joined, joined,
NULL, NULL,
BW_NAVIGATE_VERIFIABLE, BW_NAVIGATE_NONE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -129,7 +128,7 @@ setter href %{
browser_window_navigate(bw, browser_window_navigate(bw,
joined, joined,
NULL, NULL,
BW_NAVIGATE_VERIFIABLE, BW_NAVIGATE_NONE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -409,8 +409,7 @@ monkey_window_handle_go(int argc, char **argv)
browser_window_navigate(gw->bw, browser_window_navigate(gw->bw,
url, url,
ref_url, ref_url,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -1711,8 +1711,7 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target, browser_window_navigate(target,
action_query, action_query,
page_url, page_url,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1732,8 +1731,7 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target, browser_window_navigate(target,
action_url, action_url,
page_url, page_url,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
data, data,
NULL, NULL,
NULL); NULL);
@ -1743,8 +1741,7 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target, browser_window_navigate(target,
action_url, action_url,
page_url, page_url,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
success, success,
NULL); NULL);

View File

@ -823,8 +823,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
browser_window_navigate(bw, browser_window_navigate(bw,
url, url,
content_get_url(c), content_get_url(c),
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1003,8 +1002,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
browser_window_navigate(browser_window_find_target(bw, target, mouse), browser_window_navigate(browser_window_find_target(bw, target, mouse),
url, url,
content_get_url(c), content_get_url(c),
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -1515,8 +1515,7 @@ void ro_msg_dataload(wimp_message *message)
error = browser_window_navigate(g->bw, error = browser_window_navigate(g->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -857,8 +857,7 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i,
browser_window_navigate(g->bw, browser_window_navigate(g->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -734,8 +734,7 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer)
browser_window_navigate(g->bw, browser_window_navigate(g->bw,
url_complete_matches[url_complete_matches_selection], url_complete_matches[url_complete_matches_selection],
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -2831,8 +2831,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
error = browser_window_navigate(bw, error = browser_window_navigate(bw,
url, url,
hlcache_handle_get_url(h), hlcache_handle_get_url(h),
BW_NAVIGATE_DOWNLOAD | BW_NAVIGATE_DOWNLOAD,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -4006,7 +4005,7 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1)
browser_window_navigate(g->bw, browser_window_navigate(g->bw,
url, url,
NULL, NULL,
BW_CREATE_HISTORY, BW_NAVIGATE_HISTORY | BW_NAVIGATE_UNVERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -4046,8 +4045,7 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url)
browser_window_navigate(g->bw, browser_window_navigate(g->bw,
parent, parent,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -4083,8 +4081,7 @@ void ro_gui_window_action_home(struct gui_window *g)
error = browser_window_navigate(g->bw, error = browser_window_navigate(g->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);

View File

@ -133,8 +133,7 @@ nsws_window_go(HWND hwnd, const char *urltxt)
browser_window_navigate(gw->bw, browser_window_navigate(gw->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -876,8 +875,7 @@ nsws_window_command(HWND hwnd,
browser_window_navigate(gw->bw, browser_window_navigate(gw->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);
@ -1045,8 +1043,7 @@ nsws_window_command(HWND hwnd,
browser_window_navigate(gw->bw, browser_window_navigate(gw->bw,
url, url,
NULL, NULL,
BW_NAVIGATE_HISTORY | BW_NAVIGATE_HISTORY,
BW_NAVIGATE_VERIFIABLE,
NULL, NULL,
NULL, NULL,
NULL); NULL);