diff options
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/gui/url_bar.c | 2 | ||||
-rw-r--r-- | riscos/url_complete.c | 2 | ||||
-rw-r--r-- | riscos/window.c | 6 | ||||
-rw-r--r-- | riscos/window.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index b5f6a6e14..29eddedca 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -855,7 +855,7 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { - gui_window_set_url(g, url); + ro_gui_window_set_url(g, url); browser_window_navigate(g->bw, url, diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 6881de7ea..c4d689654 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -733,7 +733,7 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) /* Do NOT make any attempt to use any of the global url * completion variables after this call to browser_window_navigate. * They will be invalidated by (at least): - * + gui_window_set_url + * + ro_gui_window_set_url * + destruction of (i)frames within the current page * Any attempt to use them will probably result in a crash. */ diff --git a/riscos/window.c b/riscos/window.c index 188a1d6e3..61d5ea8a0 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1050,7 +1050,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) /* exported function documented in riscos/window.h */ -nserror gui_window_set_url(struct gui_window *g, nsurl *url) +nserror ro_gui_window_set_url(struct gui_window *g, nsurl *url) { if (g->toolbar) { ro_toolbar_set_url(g->toolbar, nsurl_access(url), true, false); @@ -3914,7 +3914,7 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1) if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { - gui_window_set_url(g, url); + ro_gui_window_set_url(g, url); browser_window_navigate(g->bw, url, NULL, BW_NAVIGATE_HISTORY, @@ -5022,7 +5022,7 @@ static struct gui_window_table window_table = { .reformat = riscos_window_reformat, .set_title = gui_window_set_title, - .set_url = gui_window_set_url, + .set_url = ro_gui_window_set_url, .set_icon = gui_window_set_icon, .set_status = riscos_window_set_status, .set_pointer = gui_window_set_pointer, diff --git a/riscos/window.h b/riscos/window.h index 8edacb359..2e6f6e9aa 100644 --- a/riscos/window.h +++ b/riscos/window.h @@ -40,7 +40,7 @@ bool ro_gui_window_check_menu(wimp_menu *menu); * \param g gui_window to update * \param url new url for address bar */ -nserror gui_window_set_url(struct gui_window *g, struct nsurl *url); +nserror ro_gui_window_set_url(struct gui_window *g, struct nsurl *url); #endif |