From 8dfe22515312a8ecf4da974feb31b0f5e7f317e5 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Tue, 14 Jan 2014 16:04:02 +0000
Subject: move download operations to download table

---
 amiga/download.c | 17 +++++++++++++----
 amiga/download.h |  2 ++
 amiga/gui.c      |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'amiga')

diff --git a/amiga/download.c b/amiga/download.c
index d33b723d1..60190ce17 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -85,7 +85,7 @@ enum {
 
 int downloads_in_progress = 0;
 
-struct gui_download_window *gui_download_window_create(download_context *ctx,
+static struct gui_download_window *gui_download_window_create(download_context *ctx,
 		struct gui_window *gui)
 {
 	const char *url = download_context_get_url(ctx);
@@ -193,7 +193,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx,
 	return dw;
 }
 
-nserror gui_download_window_data(struct gui_download_window *dw, 
+static nserror gui_download_window_data(struct gui_download_window *dw, 
 		const char *data, unsigned int size)
 {
 	APTR va[3];
@@ -227,7 +227,7 @@ nserror gui_download_window_data(struct gui_download_window *dw,
 	return NSERROR_OK;
 }
 
-void gui_download_window_error(struct gui_download_window *dw,
+static void gui_download_window_error(struct gui_download_window *dw,
 		const char *error_msg)
 {
 	warn_user("Unwritten","");
@@ -242,7 +242,7 @@ void ami_download_window_abort(struct gui_download_window *dw)
 	gui_download_window_done(dw);
 }
 
-void gui_download_window_done(struct gui_download_window *dw)
+static void gui_download_window_done(struct gui_download_window *dw)
 {
 	struct dlnode *dln,*dln2 = NULL;
 	struct browser_window *bw = dw->bw;
@@ -432,3 +432,12 @@ BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG si
 	if(res == 1) return TRUE;
 		else return FALSE;
 }
+
+static struct gui_download_table gui_download_table = {
+	.create = gui_download_window_create,
+	.data = gui_download_window_data,
+	.error = gui_download_window_error,
+	.done = gui_download_window_done,
+};
+
+struct gui_download_table *amiga_gui_download_table = &gui_download_table;
diff --git a/amiga/download.h b/amiga/download.h
index 2febbe908..d9e637ede 100755
--- a/amiga/download.h
+++ b/amiga/download.h
@@ -23,6 +23,8 @@
 
 #include "amiga/gui.h"
 
+extern struct gui_download_table *amiga_gui_download_table;
+
 struct download_context;
 struct gui_download_window;
 
diff --git a/amiga/gui.c b/amiga/gui.c
index 13c32cd8b..708ca09fe 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -5185,6 +5185,8 @@ int main(int argc, char** argv)
 	if (ami_locate_resource(messages, "Messages") == false)
 		die("Cannot open Messages file");
 
+	ami_gui_table.download = amiga_gui_download_table;
+
 	ret = netsurf_init(messages, &ami_gui_table);
 	if (ret != NSERROR_OK) {
 		die("NetSurf failed to initialise");
-- 
cgit v1.2.3