move download operations to download table

3 files changed, 20 insertions, 5 deletions

diff --git a/atari/download.c b/atari/download.c
index e4a45e82e..4da9ef345 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -246,8 +246,8 @@ static char * select_filepath( const char * path, const char * filename )
 	return(ret);
 }

 
-struct gui_download_window * gui_download_window_create(download_context *ctx,

-		struct gui_window *parent)
+static struct gui_download_window * 
+gui_download_window_create(download_context *ctx, struct gui_window *parent)
 {
 	const char *filename;

 	char *destination;

@@ -359,7 +359,7 @@ struct gui_download_window * gui_download_window_create(download_context *ctx,
 }
 

 

-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)

 {

 
@@ -415,7 +415,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)

 {

 	LOG(("%s", error_msg));

@@ -426,7 +426,7 @@ void gui_download_window_error(struct gui_download_window *dw,
 	// TODO: change abort to close

 }

 

-void gui_download_window_done(struct gui_download_window *dw)

+static void gui_download_window_done(struct gui_download_window *dw)

 {
 	OBJECT * tree;

 	LOG((""));
@@ -454,3 +454,13 @@ void gui_download_window_done(struct gui_download_window *dw)
 	}
 	gui_window_set_status(input_window, messages_get("Done") );

 }

+
+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 *atari_gui_download_table = &gui_download_table;
+
diff --git a/atari/download.h b/atari/download.h
index e25893d4a..a5da60538 100755
--- a/atari/download.h
+++ b/atari/download.h
@@ -58,4 +58,6 @@ struct gui_download_window {
 	bool close_on_finish;

 };

 

+struct gui_download_table *atari_gui_download_table;
+
 #endif

diff --git a/atari/gui.c b/atari/gui.c
index c2109c985..3128de772 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -1116,6 +1116,9 @@ int main(int argc, char** argv)
 
     /* common initialisation */
     LOG(("Initialising core..."));
+
+    atari_gui_table.download = nsgtk_gui_download_table;
+
     ret = netsurf_init(messages, atari_gui_table);
     if (ret != NSERROR_OK) {
 	die("NetSurf failed to initialise");