From 2583180b798193121122921193bdaffb872bde48 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Mon, 24 Jan 2005 22:14:59 +0000 Subject: [project @ 2005-01-24 22:14:59 by bursa] Simplify browser_window_go(). Replace browser_window_go_post() with browser_window_go() where possible. svn path=/import/netsurf/; revision=1466 --- riscos/401login.c | 4 ++-- riscos/gui.c | 2 +- riscos/menus.c | 5 ++--- riscos/plugin.c | 3 +-- riscos/window.c | 8 ++++---- 5 files changed, 10 insertions(+), 12 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index 449864638..4f68d463d 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -103,7 +103,7 @@ bool ro_gui_401login_keypress(wimp_key *key) case wimp_KEY_RETURN: get_unamepwd(); ro_gui_dialog_close(dialog_401li); - browser_window_go(bwin, url, 0, false); + browser_window_go(bwin, url, 0); return true; } @@ -122,7 +122,7 @@ void ro_gui_401login_click(wimp_pointer *pointer) case ICON_401LOGIN_LOGIN: get_unamepwd(); ro_gui_dialog_close(dialog_401li); - browser_window_go(bwin, url, 0, false); + browser_window_go(bwin, url, 0); break; case ICON_401LOGIN_CANCEL: ro_gui_dialog_close(dialog_401li); diff --git a/riscos/gui.c b/riscos/gui.c index 9545ba458..0bb520ec8 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1184,7 +1184,7 @@ void ro_msg_dataload(wimp_message *message) return; if (g) { - browser_window_go(g->bw, url, 0, false); + browser_window_go(g->bw, url, 0); } else { if ((hotlist_tree) && ((wimp_w)hotlist_tree->handle == message->data.data_xfer.w)) { diff --git a/riscos/menus.c b/riscos/menus.c index 8c27d38bb..7d9325dba 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -951,13 +951,12 @@ void ro_gui_menu_selection(wimp_selection *selection) switch (selection->items[1]) { case 0: /* Home */ if (option_homepage_url && option_homepage_url[0]) { - browser_window_go_post(current_gui->bw, option_homepage_url, - 0, 0, true, 0, false); + browser_window_go(current_gui->bw, option_homepage_url, 0); } else { snprintf(url, sizeof url, "file://Docs/intro_%s", option_language); - browser_window_go_post(current_gui->bw, url, 0, 0, true, 0, false); + browser_window_go(current_gui->bw, url, 0); } break; case 1: /* Back */ diff --git a/riscos/plugin.c b/riscos/plugin.c index ec35d20d1..03692c262 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -800,8 +800,7 @@ void plugin_url_access(wimp_message *message) strcasecmp(window, "_parent") == 0 || strcasecmp(window, "_top") == 0 || strcasecmp(window, "") == 0) { - browser_window_go(c->data.plugin.bw, url, - 0, false); + browser_window_go(c->data.plugin.bw, url, 0); } else if (strcasecmp(window, "_blank") == 0) { browser_window_create(url, NULL, 0); diff --git a/riscos/window.c b/riscos/window.c index ef620b006..65dc08377 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1128,8 +1128,8 @@ void ro_gui_toolbar_click(struct gui_window *g, wimp_pointer *pointer) case ICON_TOOLBAR_HOME: if (option_homepage_url && option_homepage_url[0]) { if (pointer->buttons == wimp_CLICK_SELECT) { - browser_window_go_post(g->bw, option_homepage_url, - 0, 0, true, 0, false); + browser_window_go(g->bw, + option_homepage_url, 0); } else { browser_window_create(option_homepage_url, NULL, 0); } @@ -1138,7 +1138,7 @@ void ro_gui_toolbar_click(struct gui_window *g, wimp_pointer *pointer) "file://Docs/intro_%s", option_language); if (pointer->buttons == wimp_CLICK_SELECT) { - browser_window_go_post(g->bw, url, 0, 0, true, 0, false); + browser_window_go(g->bw, url, 0); } else { browser_window_create(url, NULL, 0); } @@ -1518,7 +1518,7 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar) res = url_normalize(toolbar_url, &url); if (res == URL_FUNC_OK) { gui_window_set_url(g, url); - browser_window_go(g->bw, url, 0, false); + browser_window_go(g->bw, url, 0); free(url); } return true; -- cgit v1.2.3