diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
commit | 270ef59a98d34fef418fb6cd27e46f3edc912948 (patch) | |
tree | 9d363b42d441640e1d2dbff3ba548a2cdf8d67a9 /riscos | |
parent | 21da4f5bdf74c6654730c32dfcc1c6b3d24da4b4 (diff) | |
download | netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.gz netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.bz2 |
Merge jmb/new-cache; r=dsilvers,rs=vince
svn path=/trunk/netsurf/; revision=10180
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/gui.c | 10 | ||||
-rw-r--r-- | riscos/window.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index a1c1980e2..d2b964146 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -279,7 +279,15 @@ static void *myrealloc(void *ptr, size_t len, void *pw) int main(int argc, char** argv) { setbuf(stderr, NULL); - return netsurf_main(argc, argv); + + /* initialise netsurf */ + netsurf_init(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; } /** diff --git a/riscos/window.c b/riscos/window.c index effb4dac6..335a36409 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1396,12 +1396,10 @@ bool gui_window_frame_resize_start(struct gui_window *g) * \param g gui_window containing the content * \param c the content to save */ - -void gui_window_save_as_link(struct gui_window *g, struct content *c) +void gui_window_save_link(struct gui_window *g, const char *url, + const char *title) { - if (!c) - return; - ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL, c->url, c->title); + ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL, url, title); ro_gui_dialog_open_persistent(g->window, dialog_saveas, true); } |