Merge jmb/new-cache; r=dsilvers,rs=vince

svn path=/trunk/netsurf/; revision=10180

1 files changed, 11 insertions, 2 deletions

diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 6c05bc401..90db0ff94 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -424,7 +424,15 @@ static int32 bapp_thread(void *arg)
 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;
 }
 
 void gui_init(int argc, char** argv)
@@ -843,7 +851,8 @@ void gui_create_form_select_menu(struct browser_window *bw,
 #endif
 }
 
-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)
 {
 }