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

---
 monkey/browser.h  |  1 +
 monkey/download.c | 17 +++++++++++++----
 monkey/main.c     |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'monkey')

diff --git a/monkey/browser.h b/monkey/browser.h
index 892c615ab..6c74a412c 100644
--- a/monkey/browser.h
+++ b/monkey/browser.h
@@ -37,6 +37,7 @@ struct gui_window {
 };
 
 extern struct gui_window_table *monkey_gui_window_table;
+extern struct gui_download_table *monkey_gui_download_table;
 
 struct gui_window *monkey_find_window_by_num(uint32_t win_num);
 struct gui_window *monkey_find_window_by_content(hlcache_handle *content);
diff --git a/monkey/download.c b/monkey/download.c
index d706dd6e0..46d54dc0c 100644
--- a/monkey/download.c
+++ b/monkey/download.c
@@ -34,7 +34,7 @@ struct gui_download_window {
 
 static struct gui_download_window *dw_ring = NULL;
 
-struct gui_download_window *
+static struct gui_download_window *
 gui_download_window_create(download_context *ctx,
                            struct gui_window *parent)
 {
@@ -52,7 +52,7 @@ gui_download_window_create(download_context *ctx,
   return ret;
 }
 
-nserror 
+static nserror 
 gui_download_window_data(struct gui_download_window *dw, 
                          const char *data, unsigned int size)
 {
@@ -61,7 +61,7 @@ gui_download_window_data(struct gui_download_window *dw,
   return NSERROR_OK;
 }
 
-void
+static void
 gui_download_window_error(struct gui_download_window *dw,
                           const char *error_msg)
 {
@@ -69,7 +69,7 @@ gui_download_window_error(struct gui_download_window *dw,
           dw->dwin_num, error_msg);
 }
 
-void
+static void
 gui_download_window_done(struct gui_download_window *dw)
 {
   fprintf(stdout, "DOWNLOAD_WINDOW DONE DWIN %u\n",
@@ -77,3 +77,12 @@ gui_download_window_done(struct gui_download_window *dw)
   RING_REMOVE(dw_ring, dw);
   free(dw);
 }
+
+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 *monkey_gui_download_table = &gui_download_table;
diff --git a/monkey/main.c b/monkey/main.c
index c6aa60f10..ce7906e03 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -153,6 +153,7 @@ main(int argc, char **argv)
   messages = filepath_find(respaths, "Messages");
 
   monkey_gui_table.window = monkey_gui_window_table;
+  monkey_gui_table.download = monkey_gui_download_table;
 
   ret = netsurf_init(messages, &monkey_gui_table);
   free(messages);
-- 
cgit v1.2.3