diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-29 00:17:11 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-29 00:18:12 +0000 |
| commit | 7ace528729c37d665e269c8a76991739c9437088 (patch) | |
| tree | c6e6d60655da38fecd8f9bd74980b01f402715e8 /riscos | |
| parent | 4b941297aaa8de2b092b6b799fcfc91d6e0e4782 (diff) | |
| download | netsurf-7ace528729c37d665e269c8a76991739c9437088.tar.gz netsurf-7ace528729c37d665e269c8a76991739c9437088.tar.bz2 | |
Update url setting API to return nserror code instead of calling warn_user
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/window.c | 11 | ||||
| -rw-r--r-- | riscos/window.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/riscos/window.c b/riscos/window.c index b7cb6e80c..6a62d560c 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1052,13 +1052,14 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) /* exported function documented in riscos/window.h */ -void gui_window_set_url(struct gui_window *g, const char *url) +nserror gui_window_set_url(struct gui_window *g, const char *url) { - if (!g->toolbar) - return; + if (g->toolbar) { + ro_toolbar_set_url(g->toolbar, url, true, false); + ro_gui_url_complete_start(g->toolbar); + } - ro_toolbar_set_url(g->toolbar, url, true, false); - ro_gui_url_complete_start(g->toolbar); + return NSERROR_OK; } diff --git a/riscos/window.h b/riscos/window.h index c4daf8bb8..ea31fcb9b 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 */ -void gui_window_set_url(struct gui_window *g, const char *url); +nserror gui_window_set_url(struct gui_window *g, const char *url); #endif |