summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2013-02-18 11:51:42 +0000
committerVincent Sanders <vince@netsurf-browser.org>2013-02-18 11:51:42 +0000
commit529ca251fcc47de243e0dba22af83828de3d97e7 (patch)
tree883ace5365cd08f7ea440571974811867b8a74b7
parentb112dec78d5e8289ded3f61db96e495690ae96b5 (diff)
downloadnetsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.gz
netsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.bz2
rename flags for browser_window routines to be shorter
-rw-r--r--[-rwxr-xr-x]amiga/arexx.c26
-rw-r--r--[-rwxr-xr-x]amiga/context_menu.c30
-rw-r--r--amiga/download.c4
-rw-r--r--amiga/file.c4
-rw-r--r--[-rwxr-xr-x]amiga/gui.c78
-rw-r--r--[-rwxr-xr-x]amiga/menu.c18
-rw-r--r--[-rwxr-xr-x]amiga/tree.c4
-rw-r--r--atari/ctxmenu.c12
-rw-r--r--atari/deskmenu.c16
-rw-r--r--atari/gui.c4
-rw-r--r--atari/toolbar.c8
-rw-r--r--beos/gui.cpp4
-rw-r--r--beos/scaffolding.cpp22
-rw-r--r--cocoa/BookmarksController.m8
-rw-r--r--cocoa/BrowserView.m18
-rw-r--r--cocoa/BrowserViewController.m8
-rw-r--r--cocoa/BrowserWindowController.m6
-rw-r--r--cocoa/NetSurfAppDelegate.m16
-rw-r--r--cocoa/NetsurfApp.m4
-rw-r--r--desktop/browser.c32
-rw-r--r--desktop/browser.h10
-rw-r--r--desktop/frames.c4
-rw-r--r--desktop/history_core.c4
-rw-r--r--desktop/searchweb.c6
-rw-r--r--desktop/tree_url_node.c6
-rw-r--r--framebuffer/gui.c8
-rw-r--r--gtk/dialogs/about.c8
-rw-r--r--gtk/dialogs/source.c4
-rw-r--r--gtk/gui.c4
-rw-r--r--gtk/scaffolding.c44
-rw-r--r--javascript/jsapi/location.bnd8
-rw-r--r--monkey/browser.c8
-rw-r--r--render/form.c12
-rw-r--r--render/html_interaction.c8
-rw-r--r--riscos/dialog.c4
-rw-r--r--riscos/gui.c16
-rw-r--r--riscos/gui/url_bar.c4
-rw-r--r--riscos/iconbar.c4
-rw-r--r--riscos/uri.c4
-rw-r--r--riscos/url_complete.c4
-rw-r--r--riscos/url_protocol.c4
-rw-r--r--riscos/window.c52
-rw-r--r--windows/gui.c14
-rw-r--r--windows/main.c4
44 files changed, 283 insertions, 283 deletions
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 606f348cb..491fc03bd 100755..100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -248,8 +248,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(curbw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -257,9 +257,9 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
}
else if(cmd->ac_ArgList[2])
{
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
NULL,
@@ -267,8 +267,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
}
else if(cmd->ac_ArgList[1])
{
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -281,16 +281,16 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
}
else
{
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -510,8 +510,8 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 2091f55ca..fd5748c62 100755..100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -780,8 +780,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
case CMID_URLOPENWIN:
error = nsurl_create(userdata, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
hlcache_handle_get_url(gwin->bw->current_content),
gwin->bw,
@@ -799,9 +799,9 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
case CMID_URLOPENTAB:
error = nsurl_create(userdata, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
hlcache_handle_get_url(gwin->bw->current_content),
gwin->bw,
@@ -824,8 +824,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -839,8 +839,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -856,8 +856,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -932,8 +932,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1004,8 +1004,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/download.c b/amiga/download.c
index 9db05ca49..3d3b95dea 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -299,8 +299,8 @@ void gui_download_window_done(struct gui_download_window *dw)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/file.c b/amiga/file.c
index 419cc2a4d..12ed12a33 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -102,8 +102,8 @@ void ami_file_open(struct gui_window_2 *gwin)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/gui.c b/amiga/gui.c
index 0269fa0e5..52878e7a1 100755..100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -730,8 +730,8 @@ static void gui_init2(int argc, char** argv)
{
error = nsurl_create(temp_homepage_url, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -783,8 +783,8 @@ static void gui_init2(int argc, char** argv)
if (error == NSERROR_OK) {
if(!first)
{
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -794,8 +794,8 @@ static void gui_init2(int argc, char** argv)
}
else
{
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
bw,
@@ -881,8 +881,8 @@ static void gui_init2(int argc, char** argv)
if(!bw && (nsoption_bool(startup_no_window) == false)) {
error = nsurl_create(nsoption_charp(homepage_url), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -1678,9 +1678,9 @@ void ami_handle_msg(void)
error = nsurl_create(nsoption_charp(homepage_url), &urlns);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
urlns,
NULL,
gwin->bw,
@@ -1710,8 +1710,8 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1739,8 +1739,8 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1759,8 +1759,8 @@ void ami_handle_msg(void)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1830,8 +1830,8 @@ void ami_handle_msg(void)
error = nsurl_create(nsoption_charp(homepage_url), &urlns);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
urlns,
NULL,
gwin->bw,
@@ -1852,8 +1852,8 @@ void ami_handle_msg(void)
error = nsurl_create(nsoption_charp(homepage_url), &urlns);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
urlns,
NULL,
gwin->bw,
@@ -2229,8 +2229,8 @@ void ami_handle_appmsg(void)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -2239,9 +2239,9 @@ void ami_handle_appmsg(void)
}
else
{
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
gwin->bw,
@@ -2270,8 +2270,8 @@ void ami_handle_appmsg(void)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -2280,9 +2280,9 @@ void ami_handle_appmsg(void)
}
else
{
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
gwin->bw,
@@ -2324,8 +2324,8 @@ void ami_handle_applib(void)
error = nsurl_create(nsoption_charp(homepage_url), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2348,8 +2348,8 @@ void ami_handle_applib(void)
error = nsurl_create(tempurl, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2374,8 +2374,8 @@ void ami_handle_applib(void)
{
error = nsurl_create(nsoption_charp(homepage_url), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -4791,8 +4791,8 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/menu.c b/amiga/menu.c
index a5fe4c342..af485bcf9 100755..100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -705,8 +705,8 @@ static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct
error = nsurl_create(nsoption_charp(homepage_url), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -728,9 +728,9 @@ static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct
error = nsurl_create(nsoption_charp(homepage_url), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
gwin->bw,
@@ -832,8 +832,8 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -1044,8 +1044,8 @@ static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/amiga/tree.c b/amiga/tree.c
index 32cd8a1fa..bab8f25fc 100755..100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -327,8 +327,8 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y)
browser_window_navigate(gwin->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 2a6d6e2ba..76761d417 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -196,8 +196,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL
@@ -216,8 +216,8 @@ void context_popup(struct gui_window * gw, short x, short y)
gw->browser->bw,
url,
hlcache_handle_get_url(gw->browser->bw->current_content),
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL
@@ -253,8 +253,8 @@ void context_popup(struct gui_window * gw, short x, short y)
error = nsurl_create(ctx->ccdata.link_url, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
hlcache_handle_get_url(gw->browser->bw->current_content),
gw->browser->bw
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 0cb8409b9..676896bfd 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -159,8 +159,8 @@ static void __CDECL menu_about(short item, short title, void *data)
error = nsurl_create(buf, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -189,8 +189,8 @@ static void __CDECL menu_new_win(short item, short title, void *data)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -211,8 +211,8 @@ static void __CDECL menu_open_url(short item, short title, void *data)
gw = input_window;
if( gw == NULL ) {
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
NULL,
NULL,
NULL,
@@ -243,8 +243,8 @@ static void __CDECL menu_open_file(short item, short title, void *data)
error = nsurl_create(urltxt, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/atari/gui.c b/atari/gui.c
index 4a0c70537..049700440 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -1068,8 +1068,8 @@ int main(int argc, char** argv)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/atari/toolbar.c b/atari/toolbar.c
index eca44fa88..e07b6523d 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -716,8 +716,8 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
browser_window_navigate(gw->browser->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -969,8 +969,8 @@ void toolbar_home_click(struct s_toolbar *tb)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/beos/gui.cpp b/beos/gui.cpp
index 3a164133f..b8e5822e3 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -441,8 +441,8 @@ static void gui_init2(int argc, char** argv)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 53a4a7b5b..bdda729dd 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -791,13 +791,13 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw,
nsurl,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
} else {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
nsurl,
NULL,
bw,
@@ -821,7 +821,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
for (i = 1; message->FindString("argv", i, &urltxt) >= B_OK; i++) {
error = nsurl_create(urltxt.String(), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
url,
NULL,
bw,
@@ -855,8 +855,8 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw,
nsurl,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -926,8 +926,8 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -955,8 +955,8 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1039,7 +1039,7 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
error = nsurl_create(text.String(), &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
url,
NULL,
bw,
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 830c054a7..1f7be4fdf 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -141,14 +141,14 @@ static const char *cocoa_hotlist_path( void )
error = browser_window_navigate([tab browser],
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
} else {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index aed2230b9..02aa15bab 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -580,9 +580,9 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
error = nsurl_create([[sender representedObject] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
browser,
@@ -601,8 +601,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
error = nsurl_create([[sender representedObject] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
browser,
@@ -622,8 +622,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -687,8 +687,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 7a134eedf..cd0f4bd12 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -77,8 +77,8 @@
browser_window_navigate(browser,
nsurl,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -141,8 +141,8 @@
browser_window_navigate(browser,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index 771ae0841..9e6581ecc 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -159,9 +159,9 @@
error = nsurl_create(NETSURF_HOMEPAGE, &url);
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
[activeBrowser browser],
diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m
index ba8678d42..fc9171b40 100644
--- a/cocoa/NetSurfAppDelegate.m
+++ b/cocoa/NetSurfAppDelegate.m
@@ -49,8 +49,8 @@
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -73,8 +73,8 @@
for (NSURL *url in [openPanel URLs]) {
error = nsurl_create([[url absoluteString] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -96,8 +96,8 @@
error = nsurl_create([urlAsString UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -180,8 +180,8 @@
error = nsurl_create([[urltxt absoluteString] UTF8String], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index b9cf4b999..9d19824ae 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -199,8 +199,8 @@ int main( int argc, char **argv )
error = nsurl_create(argv[i], &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/desktop/browser.c b/desktop/browser.c
index 42b9a1398..ca72c41a2 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -673,7 +673,7 @@ browser_window_create(enum browser_window_nav_flags flags,
/* caller must provide window to clone or be adding to history */
assert(clone ||
- ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0));
+ ((flags & BROWSER_WINDOW_HISTORY) != 0));
if ((bw = calloc(1, sizeof(struct browser_window))) == NULL) {
@@ -702,7 +702,7 @@ browser_window_create(enum browser_window_nav_flags flags,
bw->window = gui_create_browser_window(bw,
top,
- ((flags & BROWSER_WINDOW_GO_FLAG_TAB) != 0));
+ ((flags & BROWSER_WINDOW_TAB) != 0));
if (bw->window == NULL) {
browser_window_destroy(bw);
@@ -710,7 +710,7 @@ browser_window_create(enum browser_window_nav_flags flags,
}
if (url != NULL) {
- flags |= BROWSER_WINDOW_GO_FLAG_VERIFIABLE;
+ flags |= BROWSER_WINDOW_VERIFIABLE;
browser_window_navigate(bw, url, referrer, flags, NULL, NULL, NULL);
}
@@ -832,7 +832,7 @@ nserror browser_window_navigate(struct browser_window *bw,
}
/* Set up retrieval parameters */
- if ((flags & BROWSER_WINDOW_GO_FLAG_VERIFIABLE) != 0) {
+ if ((flags & BROWSER_WINDOW_VERIFIABLE) != 0) {
fetch_flags |= LLCACHE_RETRIEVE_VERIFIABLE;
}
@@ -856,7 +856,7 @@ nserror browser_window_navigate(struct browser_window *bw,
}
/* Get download out of the way */
- if ((flags & BROWSER_WINDOW_GO_FLAG_DOWNLOAD) != 0) {
+ if ((flags & BROWSER_WINDOW_DOWNLOAD) != 0) {
error = browser_window_download(bw,
url,
referrer,
@@ -900,7 +900,7 @@ nserror browser_window_navigate(struct browser_window *bw,
nsurl_unref(referrer);
}
- if ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0) {
+ if ((flags & BROWSER_WINDOW_HISTORY) != 0) {
history_add(bw->history,
bw->current_content,
bw->frag_id == NULL ? NULL :
@@ -925,12 +925,12 @@ nserror browser_window_navigate(struct browser_window *bw,
LOG(("Loading '%s'", nsurl_access(url)));
browser_window_set_status(bw, messages_get("Loading"));
- if ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0) {
+ if ((flags & BROWSER_WINDOW_HISTORY) != 0) {
bw->history_add = true;
}
/* Verifiable fetches may trigger a download */
- if ((flags & BROWSER_WINDOW_GO_FLAG_VERIFIABLE) != 0) {
+ if ((flags & BROWSER_WINDOW_VERIFIABLE) != 0) {
fetch_flags |= HLCACHE_RETRIEVE_MAY_DOWNLOAD;
}
@@ -1610,7 +1610,7 @@ void browser_window_refresh(void *p)
nsurl *url;
nsurl *refresh;
hlcache_handle *parent = NULL;
- enum browser_window_nav_flags flags = BROWSER_WINDOW_GO_FLAG_NONE;
+ enum browser_window_nav_flags flags = BROWSER_WINDOW_NONE;
assert(bw->current_content != NULL &&
(content_get_status(bw->current_content) ==
@@ -1629,7 +1629,7 @@ void browser_window_refresh(void *p)
url = hlcache_handle_get_url(bw->current_content);
if ((url == NULL) || (nsurl_compare(url, refresh, NSURL_COMPLETE))) {
- flags |= BROWSER_WINDOW_GO_FLAG_HISTORY;
+ flags |= BROWSER_WINDOW_HISTORY;
}
/* Treat an (almost) immediate refresh in a top-level browser window as
@@ -1640,7 +1640,7 @@ void browser_window_refresh(void *p)
* all.
*/
if (bw->refresh_interval <= 100 && bw->parent == NULL) {
- flags |= BROWSER_WINDOW_GO_FLAG_VERIFIABLE;
+ flags |= BROWSER_WINDOW_VERIFIABLE;
} else {
parent = bw->current_content;
}
@@ -1924,7 +1924,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
browser_window_navigate(bw,
hlcache_handle_get_url(bw->current_content),
NULL,
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -2351,8 +2351,8 @@ struct browser_window *browser_window_find_target(struct browser_window *bw,
* OR
* - button_2 opens in new tab and the link target is "_blank"
*/
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_TAB,
NULL,
NULL,
bw,
@@ -2378,7 +2378,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw,
* - button_2 doesn't open in new tabs and the link target is
* "_blank"
*/
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
bw,
@@ -2417,7 +2417,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw,
if (!nsoption_bool(target_blank))
return bw;
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
bw,
diff --git a/desktop/browser.h b/desktop/browser.h
index bcba585e8..cad8bf706 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -64,17 +64,17 @@ extern bool browser_reformat_pending;
/** flags to browser window go */
enum browser_window_nav_flags {
- BROWSER_WINDOW_GO_FLAG_NONE = 0,
+ BROWSER_WINDOW_NONE = 0,
/** The page is added to the window history, this should
* be used when returning to a page in the window history.
*/
- BROWSER_WINDOW_GO_FLAG_HISTORY = 1,
+ BROWSER_WINDOW_HISTORY = 1,
/** download rather than render the uri */
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD = 2,
+ BROWSER_WINDOW_DOWNLOAD = 2,
/** this transaction is verifiable */
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE = 4,
+ BROWSER_WINDOW_VERIFIABLE = 4,
/** open a new tab rather than a new window */
- BROWSER_WINDOW_GO_FLAG_TAB = 8,
+ BROWSER_WINDOW_TAB = 8,
};
void browser_window_initialise_common(struct browser_window *bw,
diff --git a/desktop/frames.c b/desktop/frames.c
index 235dc83ef..27085ef3d 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),
- BROWSER_WINDOW_GO_FLAG_NONE,
+ BROWSER_WINDOW_NONE,
NULL,
NULL,
bw->current_content);
@@ -389,7 +389,7 @@ void browser_window_create_frameset(struct browser_window *bw,
browser_window_navigate(window,
frame->url,
hlcache_handle_get_url(parent),
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ BROWSER_WINDOW_HISTORY,
NULL,
NULL,
parent);
diff --git a/desktop/history_core.c b/desktop/history_core.c
index 48627fa7a..648635258 100644
--- a/desktop/history_core.c
+++ b/desktop/history_core.c
@@ -462,7 +462,7 @@ void history_go(struct browser_window *bw,
current = history->current;
history->current = entry;
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE,
url,
NULL,
bw,
@@ -470,7 +470,7 @@ void history_go(struct browser_window *bw,
history->current = current;
} else {
history->current = entry;
- browser_window_navigate(bw, url, NULL, BROWSER_WINDOW_GO_FLAG_VERIFIABLE, NULL, NULL, NULL);
+ browser_window_navigate(bw, url, NULL, BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL);
}
nsurl_unref(url);
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 4b97ca82c..a90627ac6 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -71,9 +71,9 @@ bool search_web_new_window(struct browser_window *bw, const char *searchterm)
error = nsurl_create(urltxt, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
bw,
diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c
index 3b84b4c08..02afcbe9d 100644
--- a/desktop/tree_url_node.c
+++ b/desktop/tree_url_node.c
@@ -400,10 +400,10 @@ node_callback_resp tree_url_node_callback(void *user_data,
error = nsurl_create(text, &url);
if (error == NSERROR_OK) {
- flags = BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY;
+ flags = BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY;
if (msg_data->flag == TREE_ELEMENT_LAUNCH_IN_TABS) {
- flags |= BROWSER_WINDOW_GO_FLAG_TAB;
+ flags |= BROWSER_WINDOW_TAB;
}
error = browser_window_create(flags,
url,
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 81ed7214e..c08bf2c4c 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -551,8 +551,8 @@ main(int argc, char** argv)
error = nsurl_create(feurl, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -1077,8 +1077,8 @@ fb_url_enter(void *pw, char *text)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c
index 7a8c10932..3ebb4c078 100644
--- a/gtk/dialogs/about.c
+++ b/gtk/dialogs/about.c
@@ -36,8 +36,8 @@ nsgtk_about_dialog_credits(GtkWidget *button, gpointer data)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -59,8 +59,8 @@ nsgtk_about_dialog_licence(GtkWidget *button, gpointer data)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c
index 3834daa6f..9f9fa22db 100644
--- a/gtk/dialogs/source.c
+++ b/gtk/dialogs/source.c
@@ -307,8 +307,8 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw)
if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0);
} else {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_TAB,
url,
NULL,
bw,
diff --git a/gtk/gui.c b/gtk/gui.c
index 8d9912d62..592a2b65d 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -471,8 +471,8 @@ static void gui_init(int argc, char** argv, char **respath)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 3ebf051dc..6ab058269 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -461,8 +461,8 @@ gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -563,8 +563,8 @@ static void nsgtk_openfile_open(const char *filename)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -591,7 +591,7 @@ MULTIHANDLER(newwindow)
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
url,
NULL,
bw,
@@ -624,8 +624,8 @@ MULTIHANDLER(newtab)
}
}
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_TAB,
url,
NULL,
bw,
@@ -978,8 +978,8 @@ MENUHANDLER(savelink)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1005,8 +1005,8 @@ MENUHANDLER(link_openwin)
error = nsurl_create(current_menu_ctx.link_url, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
bw,
@@ -1038,9 +1038,9 @@ MENUHANDLER(link_opentab)
error = nsurl_create(current_menu_ctx.link_url, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_TAB,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_TAB,
url,
NULL,
bw,
@@ -1489,8 +1489,8 @@ MULTIHANDLER(home)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1606,8 +1606,8 @@ MULTIHANDLER(contents)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1628,8 +1628,8 @@ MULTIHANDLER(guide)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1650,8 +1650,8 @@ MULTIHANDLER(info)
browser_window_navigate(bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd
index 3cd8898bd..af76836f5 100644
--- a/javascript/jsapi/location.bnd
+++ b/javascript/jsapi/location.bnd
@@ -62,8 +62,8 @@ operation assign %{
browser_window_navigate(bw,
joined,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -84,7 +84,7 @@ operation replace %{
browser_window_navigate(bw,
joined,
NULL,
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -129,7 +129,7 @@ setter href %{
browser_window_navigate(bw,
joined,
NULL,
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/monkey/browser.c b/monkey/browser.c
index c73e0c0ef..057c2e26a 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -404,8 +404,8 @@ monkey_window_handle_new(int argc, char **argv)
error = nsurl_create(argv[2], &url);
}
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -464,8 +464,8 @@ monkey_window_handle_go(int argc, char **argv)
browser_window_navigate(gw->bw,
url,
ref_url,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/render/form.c b/render/form.c
index 998d0f293..0c0eef2cb 100644
--- a/render/form.c
+++ b/render/form.c
@@ -1485,8 +1485,8 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target,
action_query,
page_url,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1506,8 +1506,8 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target,
action_url,
page_url,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
data,
NULL,
NULL);
@@ -1517,8 +1517,8 @@ void form_submit(nsurl *page_url, struct browser_window *target,
browser_window_navigate(target,
action_url,
page_url,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
success,
NULL);
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 16e9b1c28..3f1bee475 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -707,8 +707,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
browser_window_navigate(bw,
url,
content_get_url(c),
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -863,8 +863,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/riscos/dialog.c b/riscos/dialog.c
index d66b1cb08..5e4bbbf23 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -719,8 +719,8 @@ bool ro_gui_dialog_openurl_apply(wimp_w w) {
error = nsurl_create(url2, &url);
free(url2);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/riscos/gui.c b/riscos/gui.c
index afe82aba9..2eb3942bc 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -783,8 +783,8 @@ static void gui_init2(int argc, char** argv)
errorns = nsurl_create(yrl, &urlns);
if (errorns == NSERROR_OK) {
- errorns = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ errorns = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
urlns,
NULL,
NULL,
@@ -1578,8 +1578,8 @@ void ro_msg_dataload(wimp_message *message)
error = browser_window_navigate(g->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1591,8 +1591,8 @@ void ro_msg_dataload(wimp_message *message)
#endif
} else {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -1964,8 +1964,8 @@ void ro_msg_dataopen(wimp_message *message)
free(url);
if (error == NSERROR_OK) {
/* create a new window with the file */
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
urlns,
NULL,
NULL,
diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c
index eb3483d91..b66843674 100644
--- a/riscos/gui/url_bar.c
+++ b/riscos/gui/url_bar.c
@@ -713,8 +713,8 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i,
browser_window_navigate(g->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index a23f4063c..77a135587 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -132,8 +132,8 @@ bool ro_gui_iconbar_click(wimp_pointer *pointer)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/riscos/uri.c b/riscos/uri.c
index d4e96b438..4b40329a1 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -74,8 +74,8 @@ void ro_uri_message_received(wimp_message *msg)
error = nsurl_create(uri_requested, &url);
free(uri_requested);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index b804f741a..990ce4276 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -719,8 +719,8 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer)
browser_window_navigate(g->bw,
url_complete_matches[url_complete_matches_selection],
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c
index 66245689c..e309a4d0e 100644
--- a/riscos/url_protocol.c
+++ b/riscos/url_protocol.c
@@ -125,8 +125,8 @@ void ro_url_message_received(wimp_message *message)
}
/* create new browser window */
- errorns = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ errorns = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
nsurl,
NULL,
NULL,
diff --git a/riscos/window.c b/riscos/window.c
index 29c74302a..67bcd061b 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1922,8 +1922,8 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
{
error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2668,8 +2668,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
case HELP_OPEN_CONTENTS:
error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2681,8 +2681,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
case HELP_OPEN_GUIDE:
error = nsurl_create("http://www.netsurf-browser.org/documentation/guide", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2694,8 +2694,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
case HELP_OPEN_INFORMATION:
error = nsurl_create("http://www.netsurf-browser.org/documentation/info", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2707,8 +2707,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
case HELP_OPEN_CREDITS:
error = nsurl_create("about:credits", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2720,8 +2720,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
case HELP_OPEN_LICENCE:
error = nsurl_create("about:licence", &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,
@@ -2828,8 +2828,8 @@ 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),
- BROWSER_WINDOW_GO_FLAG_DOWNLOAD |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_DOWNLOAD |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -2842,8 +2842,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
if (current_menu_url != NULL) {
error = nsurl_create(current_menu_url, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
hlcache_handle_get_url(h),
bw,
@@ -3682,7 +3682,7 @@ void ro_gui_window_toolbar_click(void *data,
hlcache_handle *h = g->bw->current_content;
nserror error;
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
g->bw,
@@ -3963,8 +3963,8 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1)
browser_window_navigate(g->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -4004,8 +4004,8 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url)
browser_window_navigate(g->bw,
parent,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -4041,8 +4041,8 @@ void ro_gui_window_action_home(struct gui_window *g)
error = browser_window_navigate(g->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -4068,7 +4068,7 @@ void ro_gui_window_action_navigate_back_new(struct gui_window *g)
if (g == NULL || g->bw == NULL)
return;
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
g->bw,
@@ -4096,7 +4096,7 @@ void ro_gui_window_action_navigate_forward_new(struct gui_window *g)
if (g == NULL || g->bw == NULL)
return;
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
g->bw,
@@ -4123,7 +4123,7 @@ void ro_gui_window_action_new_window(struct gui_window *g)
if (g == NULL || g->bw == NULL || g->bw->current_content == NULL)
return;
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE,
hlcache_handle_get_url(g->bw->current_content),
NULL,
g->bw,
diff --git a/windows/gui.c b/windows/gui.c
index e005ab405..101767962 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -129,8 +129,8 @@ nsws_window_go(HWND hwnd, const char *urltxt)
browser_window_navigate(gw->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -744,7 +744,7 @@ nsws_window_command(HWND hwnd,
break;
case IDM_FILE_OPEN_WINDOW:
- browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ browser_window_create(BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
gw->bw,
@@ -859,8 +859,8 @@ nsws_window_command(HWND hwnd,
browser_window_navigate(gw->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
@@ -1028,8 +1028,8 @@ nsws_window_command(HWND hwnd,
browser_window_navigate(gw->bw,
url,
NULL,
- BROWSER_WINDOW_GO_FLAG_HISTORY |
- BROWSER_WINDOW_GO_FLAG_VERIFIABLE,
+ BROWSER_WINDOW_HISTORY |
+ BROWSER_WINDOW_VERIFIABLE,
NULL,
NULL,
NULL);
diff --git a/windows/main.c b/windows/main.c
index 50449df56..489f1f02c 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -161,8 +161,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE |
- BROWSER_WINDOW_GO_FLAG_HISTORY,
+ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE |
+ BROWSER_WINDOW_HISTORY,
url,
NULL,
NULL,