diff options
| -rw-r--r-- | amiga/arexx.c | 9 | ||||
| -rw-r--r-- | amiga/context_menu.c | 15 | ||||
| -rw-r--r-- | amiga/download.c | 3 | ||||
| -rw-r--r-- | amiga/file.c | 3 | ||||
| -rw-r--r-- | amiga/gui.c | 15 | ||||
| -rw-r--r-- | amiga/menu.c | 3 | ||||
| -rw-r--r-- | amiga/tree.c | 3 | ||||
| -rw-r--r-- | atari/ctxmenu.c | 6 | ||||
| -rwxr-xr-x | atari/rootwin.c | 2 | ||||
| -rw-r--r-- | atari/toolbar.c | 5 | ||||
| -rw-r--r-- | beos/scaffolding.cpp | 12 | ||||
| -rw-r--r-- | cocoa/BookmarksController.m | 3 | ||||
| -rw-r--r-- | cocoa/BrowserView.m | 6 | ||||
| -rw-r--r-- | desktop/browser.c | 14 | ||||
| -rw-r--r-- | desktop/browser.h | 22 | ||||
| -rw-r--r-- | desktop/frames.c | 5 | ||||
| -rw-r--r-- | desktop/local_history.c | 2 | ||||
| -rw-r--r-- | framebuffer/gui.c | 10 | ||||
| -rw-r--r-- | gtk/dialogs/about.c | 6 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 21 | ||||
| -rw-r--r-- | javascript/jsapi/location.bnd | 7 | ||||
| -rw-r--r-- | monkey/browser.c | 3 | ||||
| -rw-r--r-- | render/form.c | 9 | ||||
| -rw-r--r-- | render/html_interaction.c | 6 | ||||
| -rw-r--r-- | riscos/gui.c | 3 | ||||
| -rw-r--r-- | riscos/gui/url_bar.c | 3 | ||||
| -rw-r--r-- | riscos/url_complete.c | 3 | ||||
| -rw-r--r-- | riscos/window.c | 11 | ||||
| -rw-r--r-- | windows/gui.c | 9 |
29 files changed, 90 insertions, 129 deletions
diff --git a/amiga/arexx.c b/amiga/arexx.c index 515ee6d00..240aafeec 100644 --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -248,8 +248,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(curbw, url, NULL, - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, NULL, NULL, NULL); @@ -279,8 +278,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -507,8 +505,7 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 0662a2c33..c7e438fd9 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -820,8 +820,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, url, hlcache_handle_get_url(gwin->bw->current_content), - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, 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, hlcache_handle_get_url(userdata), hlcache_handle_get_url(gwin->bw->current_content), - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, 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, url, hlcache_handle_get_url(gwin->bw->current_content), - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, 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, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, 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, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/amiga/download.c b/amiga/download.c index 1d10e926f..0f8ae4cb3 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -274,8 +274,7 @@ static void gui_download_window_done(struct gui_download_window *dw) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, NULL, NULL, NULL); diff --git a/amiga/file.c b/amiga/file.c index 9d4fa6b34..91d375576 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -104,8 +104,7 @@ void ami_file_open(struct gui_window_2 *gwin) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/amiga/gui.c b/amiga/gui.c index 92d668a37..1bcc36c57 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1799,8 +1799,7 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1826,8 +1825,7 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1844,8 +1842,7 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -2326,8 +2323,7 @@ void ami_handle_appmsg(void) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -4914,8 +4910,7 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/amiga/menu.c b/amiga/menu.c index 9b3c44d30..014f21c25 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -1034,8 +1034,7 @@ static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/amiga/tree.c b/amiga/tree.c index 38b63388c..8cffdb214 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -322,8 +322,7 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y) browser_window_navigate(gwin->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 37c96ef86..aeed47560 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -238,8 +238,7 @@ void context_popup(struct gui_window * gw, short x, short y) gw->browser->bw,
hlcache_handle_get_url(ctx->ccdata.object),
hlcache_handle_get_url(gw->browser->bw->current_content),
- BW_NAVIGATE_DOWNLOAD |
- BW_NAVIGATE_VERIFIABLE,
+ BW_NAVIGATE_DOWNLOAD,
NULL,
NULL,
NULL
@@ -258,8 +257,7 @@ void context_popup(struct gui_window * gw, short x, short y) gw->browser->bw,
url,
hlcache_handle_get_url(gw->browser->bw->current_content),
- BW_NAVIGATE_DOWNLOAD |
- BW_NAVIGATE_VERIFIABLE,
+ BW_NAVIGATE_DOWNLOAD,
NULL,
NULL,
NULL
diff --git a/atari/rootwin.c b/atari/rootwin.c index 4ab744271..5fc290529 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -1537,7 +1537,7 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8]) if ((tmp_url != NULL) && nsurl_create(tmp_url, &ns_url) == NSERROR_OK) { browser_window_navigate(gw->browser->bw, ns_url, NULL,
- BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE,
+ BW_NAVIGATE_HISTORY,
NULL, NULL, NULL); nsurl_unref(ns_url); } diff --git a/atari/toolbar.c b/atari/toolbar.c index 1c3126b13..aa6aa9167 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -715,7 +715,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc) warn_user("NoMemory", 0);
} else {
browser_window_navigate(gw->browser->bw, url, NULL,
- BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE,
+ BW_NAVIGATE_HISTORY,
NULL, NULL, NULL);
nsurl_unref(url);
}
@@ -1001,8 +1001,7 @@ void toolbar_home_click(struct s_toolbar *tb) browser_window_navigate(bw,
url,
NULL,
- BW_NAVIGATE_HISTORY |
- BW_NAVIGATE_VERIFIABLE,
+ BW_NAVIGATE_HISTORY,
NULL,
NULL,
NULL);
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index 1561cb26c..628debc51 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -888,7 +888,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m if (/*message->WasDropped() &&*/ i == 0) { browser_window_navigate(bw, nsurl, NULL, (browser_window_nav_flags) - (BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE), + (BW_NAVIGATE_HISTORY), NULL, NULL, NULL); } else { 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, nsurl, NULL, - (browser_window_nav_flags)(BW_NAVIGATE_HISTORY), + (browser_window_nav_flags)(BW_NAVIGATE_HISTORY | BW_NAVIGATE_UNVERIFIABLE), NULL, NULL, NULL); @@ -1019,8 +1019,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m browser_window_navigate(bw, url, NULL, - (browser_window_nav_flags)(BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE), + (browser_window_nav_flags)(BW_NAVIGATE_HISTORY), NULL, NULL, NULL); @@ -1048,8 +1047,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m browser_window_navigate(bw, url, NULL, - (browser_window_nav_flags)(BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE), + (browser_window_nav_flags)(BW_NAVIGATE_HISTORY), NULL, NULL, NULL); @@ -1268,7 +1266,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m if (nserr == NSERROR_OK) { nserr = browser_window_navigate(bw, url, NULL, - (browser_window_nav_flags)(BW_NAVIGATE_HISTORY | BW_NAVIGATE_VERIFIABLE), + (browser_window_nav_flags)(BW_NAVIGATE_HISTORY), NULL, NULL, NULL); nsurl_unref(url); } diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index 4ba66ddfa..64c2ef37a 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -142,8 +142,7 @@ static const char *cocoa_hotlist_path( void ) error = browser_window_navigate([tab browser], url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index d525832db..092c1bfd0 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -623,8 +623,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_navigate(browser, url, NULL, - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, NULL, NULL, NULL); @@ -688,8 +687,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_navigate(browser, url, NULL, - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, NULL, NULL, NULL); diff --git a/desktop/browser.c b/desktop/browser.c index 9bff58b5a..ca60e9ec1 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -755,8 +755,8 @@ nserror browser_window_create(enum browser_window_create_flags flags, if (url != NULL) { enum browser_window_nav_flags nav_flags = BW_NAVIGATE_NONE; - if (!(flags & BW_CREATE_UNVERIFIABLE)) - nav_flags |= BW_NAVIGATE_VERIFIABLE; + if (flags & BW_CREATE_UNVERIFIABLE) + nav_flags |= BW_NAVIGATE_UNVERIFIABLE; if (flags & BW_CREATE_HISTORY) nav_flags |= BW_NAVIGATE_HISTORY; browser_window_navigate(ret, url, referrer, nav_flags, NULL, @@ -1109,7 +1109,7 @@ static void browser_window_refresh(void *p) nsurl *url; nsurl *refresh; 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 && (content_get_status(bw->current_content) == @@ -1139,7 +1139,7 @@ static void browser_window_refresh(void *p) * all. */ if (bw->refresh_interval <= 100 && bw->parent == NULL) { - flags |= BW_NAVIGATE_VERIFIABLE; + flags &= ~BW_NAVIGATE_UNVERIFIABLE; } else { parent = bw->current_content; } @@ -1812,7 +1812,7 @@ nserror browser_window_navigate(struct browser_window *bw, } /* Set up retrieval parameters */ - if ((flags & BW_NAVIGATE_VERIFIABLE) != 0) { + if (!(flags & BW_NAVIGATE_UNVERIFIABLE)) { fetch_flags |= LLCACHE_RETRIEVE_VERIFIABLE; } @@ -1905,7 +1905,7 @@ nserror browser_window_navigate(struct browser_window *bw, bw->history_add = (flags & BW_NAVIGATE_HISTORY); /* Verifiable fetches may trigger a download */ - if ((flags & BW_NAVIGATE_VERIFIABLE) != 0) { + if (!(flags & BW_NAVIGATE_UNVERIFIABLE)) { fetch_flags |= HLCACHE_RETRIEVE_MAY_DOWNLOAD; } @@ -2268,7 +2268,7 @@ void browser_window_reload(struct browser_window *bw, bool all) browser_window_navigate(bw, hlcache_handle_get_url(bw->current_content), NULL, - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_NONE, NULL, NULL, NULL); diff --git a/desktop/browser.h b/desktop/browser.h index 4cb8e012a..ca99a5d16 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -76,7 +76,15 @@ enum browser_window_create_flags { /** New gui_window to be clone of "existing" gui_window */ 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), }; @@ -91,8 +99,16 @@ enum browser_window_nav_flags { /** download rather than render the uri */ BW_NAVIGATE_DOWNLOAD = (1 << 1), - /** this transaction is verifiable */ - BW_NAVIGATE_VERIFIABLE = (1 << 2) + /** Transation not caused by user interaction (e.g. JS-caused) + * + * 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) }; /** diff --git a/desktop/frames.c b/desktop/frames.c index 153c78e34..ab5f8171c 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -252,7 +252,7 @@ void browser_window_create_iframes(struct browser_window *bw, browser_window_navigate(window, cur->url, hlcache_handle_get_url(bw->current_content), - BW_NAVIGATE_NONE, + BW_NAVIGATE_UNVERIFIABLE, NULL, NULL, bw->current_content); @@ -389,7 +389,8 @@ void browser_window_create_frameset(struct browser_window *bw, browser_window_navigate(window, frame->url, hlcache_handle_get_url(parent), - BW_NAVIGATE_HISTORY, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_UNVERIFIABLE, NULL, NULL, parent); diff --git a/desktop/local_history.c b/desktop/local_history.c index 569fa44e4..687d4c754 100644 --- a/desktop/local_history.c +++ b/desktop/local_history.c @@ -463,7 +463,7 @@ void history_go(struct history *history, struct history_entry *entry, } else { history->current = entry; browser_window_navigate(history->bw, url, NULL, - BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); + BW_NAVIGATE_NONE, NULL, NULL, NULL); } nsurl_unref(url); diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 09dcdcea3..5b4f7a686 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -1094,14 +1094,8 @@ fb_url_enter(void *pw, char *text) if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { - browser_window_navigate(bw, - url, - NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, - NULL, - NULL, - NULL); + browser_window_navigate(bw, url, NULL, BW_NAVIGATE_HISTORY, + NULL, NULL, NULL); nsurl_unref(url); } diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index 1ebcb283b..2cd2f346b 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -37,8 +37,7 @@ nsgtk_about_dialog_credits(GtkWidget *button, gpointer data) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -60,8 +59,7 @@ nsgtk_about_dialog_licence(GtkWidget *button, gpointer data) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index cd54548c1..e9ef9a4c1 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -437,8 +437,7 @@ gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -550,8 +549,7 @@ static void nsgtk_openfile_open(const char *filename) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -959,8 +957,7 @@ MENUHANDLER(savelink) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, NULL, NULL, NULL); @@ -1459,8 +1456,7 @@ MULTIHANDLER(home) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1576,8 +1572,7 @@ MULTIHANDLER(contents) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1598,8 +1593,7 @@ MULTIHANDLER(guide) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1620,8 +1614,7 @@ MULTIHANDLER(info) browser_window_navigate(bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd index ef71e1d6f..f64f6330e 100644 --- a/javascript/jsapi/location.bnd +++ b/javascript/jsapi/location.bnd @@ -62,8 +62,7 @@ operation assign %{ browser_window_navigate(bw, joined, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -84,7 +83,7 @@ operation replace %{ browser_window_navigate(bw, joined, NULL, - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_NONE, NULL, NULL, NULL); @@ -129,7 +128,7 @@ setter href %{ browser_window_navigate(bw, joined, NULL, - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_NONE, NULL, NULL, NULL); diff --git a/monkey/browser.c b/monkey/browser.c index 489554305..e61d6deb3 100644 --- a/monkey/browser.c +++ b/monkey/browser.c @@ -409,8 +409,7 @@ monkey_window_handle_go(int argc, char **argv) browser_window_navigate(gw->bw, url, ref_url, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/render/form.c b/render/form.c index 3c54b418b..d02240f46 100644 --- a/render/form.c +++ b/render/form.c @@ -1711,8 +1711,7 @@ void form_submit(nsurl *page_url, struct browser_window *target, browser_window_navigate(target, action_query, page_url, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1732,8 +1731,7 @@ void form_submit(nsurl *page_url, struct browser_window *target, browser_window_navigate(target, action_url, page_url, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, data, NULL, NULL); @@ -1743,8 +1741,7 @@ void form_submit(nsurl *page_url, struct browser_window *target, browser_window_navigate(target, action_url, page_url, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, success, NULL); diff --git a/render/html_interaction.c b/render/html_interaction.c index 55eed76c6..a2baf2d39 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -823,8 +823,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw, browser_window_navigate(bw, url, content_get_url(c), - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, 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), url, content_get_url(c), - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/riscos/gui.c b/riscos/gui.c index e3826353d..1663c1703 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1515,8 +1515,7 @@ void ro_msg_dataload(wimp_message *message) error = browser_window_navigate(g->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 18bcb31fa..b757df341 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -857,8 +857,7 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, browser_window_navigate(g->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 6d99016f1..4a5d2d550 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -734,8 +734,7 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) browser_window_navigate(g->bw, url_complete_matches[url_complete_matches_selection], NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/riscos/window.c b/riscos/window.c index 27fdb39fa..bf0529805 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -2831,8 +2831,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, error = browser_window_navigate(bw, url, hlcache_handle_get_url(h), - BW_NAVIGATE_DOWNLOAD | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD, 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, url, NULL, - BW_CREATE_HISTORY, + BW_NAVIGATE_HISTORY | BW_NAVIGATE_UNVERIFIABLE, 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, parent, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -4083,8 +4081,7 @@ void ro_gui_window_action_home(struct gui_window *g) error = browser_window_navigate(g->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/windows/gui.c b/windows/gui.c index 51038a73b..2559bf21e 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -133,8 +133,7 @@ nsws_window_go(HWND hwnd, const char *urltxt) browser_window_navigate(gw->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -876,8 +875,7 @@ nsws_window_command(HWND hwnd, browser_window_navigate(gw->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); @@ -1045,8 +1043,7 @@ nsws_window_command(HWND hwnd, browser_window_navigate(gw->bw, url, NULL, - BW_NAVIGATE_HISTORY | - BW_NAVIGATE_VERIFIABLE, + BW_NAVIGATE_HISTORY, NULL, NULL, NULL); |