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 /gtk | |
parent | d18c8ed4521714c3fff3cca64685b8192ca0e075 (diff) | |
download | netsurf-8dfe22515312a8ecf4da974feb31b0f5e7f317e5.tar.gz netsurf-8dfe22515312a8ecf4da974feb31b0f5e7f317e5.tar.bz2 |
move download operations to download table
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/download.c | 30 | ||||
-rw-r--r-- | gtk/download.h | 2 | ||||
-rw-r--r-- | gtk/gui.c | 1 |
3 files changed, 15 insertions, 18 deletions
diff --git a/gtk/download.c b/gtk/download.c index e882ec798..1eb53403e 100644 --- a/gtk/download.c +++ b/gtk/download.c @@ -712,8 +712,8 @@ static void nsgtk_download_store_create_item (struct gui_download_window *dl) NSGTK_DOWNLOAD, dl, -1); } -struct gui_download_window *gui_download_window_create(download_context *ctx, - struct gui_window *gui) +static struct gui_download_window * +gui_download_window_create(download_context *ctx, struct gui_window *gui) { const char *url = download_context_get_url(ctx); unsigned long total_size = download_context_get_total_length(ctx); @@ -797,7 +797,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) { g_io_channel_write_chars(dw->write, data, size, NULL, &dw->error); @@ -820,13 +820,13 @@ nserror gui_download_window_data(struct gui_download_window *dw, } -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) { } -void gui_download_window_done(struct gui_download_window *dw) +static void gui_download_window_done(struct gui_download_window *dw) { g_io_channel_shutdown(dw->write, TRUE, &dw->error); g_io_channel_unref(dw->write); @@ -845,17 +845,11 @@ void gui_download_window_done(struct gui_download_window *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 *nsgtk_gui_download_table = &gui_download_table; diff --git a/gtk/download.h b/gtk/download.h index e85c4126a..393009dc4 100644 --- a/gtk/download.h +++ b/gtk/download.h @@ -27,4 +27,6 @@ bool nsgtk_check_for_downloads(GtkWindow *parent); void nsgtk_download_show(GtkWindow *parent); void nsgtk_download_add(gchar *url, gchar *destination); +struct gui_download_table *nsgtk_gui_download_table; + #endif @@ -1172,6 +1172,7 @@ int main(int argc, char** argv) messages = filepath_find(respaths, "Messages"); nsgtk_gui_table.window = nsgtk_gui_window_table; + nsgtk_gui_table.download = nsgtk_gui_download_table; ret = netsurf_init(messages, &nsgtk_gui_table); free(messages); |