diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-14 16:04:02 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-14 16:04:02 +0000 |
| commit | 8dfe22515312a8ecf4da974feb31b0f5e7f317e5 (patch) | |
| tree | 163091cfeda5c4cb644e08e7649f70788070a560 /windows | |
| parent | d18c8ed4521714c3fff3cca64685b8192ca0e075 (diff) | |
| download | netsurf-8dfe22515312a8ecf4da974feb31b0f5e7f317e5.tar.gz netsurf-8dfe22515312a8ecf4da974feb31b0f5e7f317e5.tar.bz2 | |
move download operations to download table
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/download.c | 18 | ||||
| -rw-r--r-- | windows/download.h | 2 | ||||
| -rw-r--r-- | windows/main.c | 3 |
3 files changed, 19 insertions, 4 deletions
diff --git a/windows/download.c b/windows/download.c index 635e3b604..5bf9798aa 100644 --- a/windows/download.c +++ b/windows/download.c @@ -45,7 +45,7 @@ static void nsws_download_update_label(void *p); static void nsws_download_update_progress(void *p); static void nsws_download_clear_data(struct gui_download_window *w); -struct gui_download_window * +static struct gui_download_window * gui_download_window_create(download_context *ctx, struct gui_window *gui) { if (downloading) { @@ -259,7 +259,8 @@ void nsws_download_clear_data(struct gui_download_window *w) } -nserror gui_download_window_data(struct gui_download_window *w, const char *data, +static nserror +gui_download_window_data(struct gui_download_window *w, const char *data, unsigned int size) { if ((w == NULL) || (w->file == NULL)) @@ -279,13 +280,13 @@ nserror gui_download_window_data(struct gui_download_window *w, const char *data return NSERROR_OK; } -void gui_download_window_error(struct gui_download_window *w, +static void gui_download_window_error(struct gui_download_window *w, const char *error_msg) { LOG(("error %s", error_msg)); } -void gui_download_window_done(struct gui_download_window *w) +static void gui_download_window_done(struct gui_download_window *w) { if (w == NULL) return; @@ -295,3 +296,12 @@ void gui_download_window_done(struct gui_download_window *w) nsws_download_clear_data(w); } +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 *win32_gui_download_table = &gui_download_table; + diff --git a/windows/download.h b/windows/download.h index 777777da5..c1b13bf65 100644 --- a/windows/download.h +++ b/windows/download.h @@ -60,4 +60,6 @@ struct gui_download_window { void nsws_download_window_init(struct gui_window *); +struct gui_download_table *win32_gui_download_table; + #endif diff --git a/windows/main.c b/windows/main.c index 5f20a70d1..eb63357af 100644 --- a/windows/main.c +++ b/windows/main.c @@ -154,6 +154,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* common initialisation */ messages = filepath_find(respaths, "messages"); + + win32_gui_table->download = nsgtk_gui_download_table; + ret = netsurf_init(messages, win32_gui_table); free(messages); if (ret != NSERROR_OK) { |