rename flags for browser_window routines to be shorter

8 files changed, 46 insertions, 46 deletions

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,