diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 22:30:45 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 22:30:45 +0000 |
| commit | c14ddad660d3c07f8dbdc8f8db902e5767821d9c (patch) | |
| tree | 3cc9e9b437b9409185dbde7f9dce236c5b31b18e /riscos | |
| parent | 03abea12a76db9be29c6a56e453cadebc05983d6 (diff) | |
| download | netsurf-c14ddad660d3c07f8dbdc8f8db902e5767821d9c.tar.gz netsurf-c14ddad660d3c07f8dbdc8f8db902e5767821d9c.tar.bz2 | |
change url setting api to take an nsurl instead of a text string
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/gui/url_bar.c | 4 | ||||
| -rw-r--r-- | riscos/window.c | 7 | ||||
| -rw-r--r-- | riscos/window.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 406fa9da7..b5f6a6e14 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -851,12 +851,12 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, nsurl *url; nserror error; - gui_window_set_url(g, urltxt); - error = nsurl_create(urltxt, &url); if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { + gui_window_set_url(g, url); + browser_window_navigate(g->bw, url, NULL, diff --git a/riscos/window.c b/riscos/window.c index 74d514693..e247bad5f 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1051,10 +1051,10 @@ 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, const char *url) +nserror gui_window_set_url(struct gui_window *g, nsurl *url) { if (g->toolbar) { - ro_toolbar_set_url(g->toolbar, url, true, false); + ro_toolbar_set_url(g->toolbar, nsurl_access(url), true, false); ro_gui_url_complete_start(g->toolbar); } @@ -3913,12 +3913,13 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1) return; ro_gui_url_complete_close(); - gui_window_set_url(g, url1); error = nsurl_create(url1, &url); if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { + gui_window_set_url(g, url); + browser_window_navigate(g->bw, url, NULL, BW_NAVIGATE_HISTORY, NULL, NULL, NULL); diff --git a/riscos/window.h b/riscos/window.h index ea31fcb9b..08eddb3f7 100644 --- a/riscos/window.h +++ b/riscos/window.h @@ -39,7 +39,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, const char *url); +nserror gui_window_set_url(struct gui_window *g, nsurl *url); #endif |