mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 14:59:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup windows download window

Browse Source 
svn path=/trunk/netsurf/; revision=10366
This commit is contained in:
Vincent Sanders 2010-04-11 18:04:31 +00:00
parent cca15e14c2
commit 27bd328df1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
windows/download.c
View File

@ -42,9 +42,8 @@ static void nsws_download_update_label(void *p);
static void nsws_download_update_progress(void *p); static void nsws_download_update_progress(void *p);
static void nsws_download_clear_data(struct gui_download_window *w); static void nsws_download_clear_data(struct gui_download_window *w);
struct gui_download_window *gui_download_window_create(const char *url, struct gui_download_window *
const char *mime_type, struct fetch *fetch, gui_download_window_create(download_context *ctx, struct gui_window *gui)
unsigned int total_size, struct gui_window *gui)
{ {
if (downloading) { if (downloading) {
/* initial implementation */ /* initial implementation */
@ -58,7 +57,9 @@ struct gui_download_window *gui_download_window_create(const char *url,
warn_user(messages_get("NoMemory"), 0); warn_user(messages_get("NoMemory"), 0);
return NULL; return NULL;
} }
int total_size = download_context_get_total_length(ctx);
char *domain, *filename, *destination; char *domain, *filename, *destination;
const char *url=download_context_get_url(ctx);
bool unknown_size = (total_size == 0); bool unknown_size = (total_size == 0);
const char *size = (unknown_size) ? const char *size = (unknown_size) ?
messages_get("UnknownSize") : messages_get("UnknownSize") :
@ -95,7 +96,6 @@ struct gui_download_window *gui_download_window_create(const char *url,
strcat(destination, filename); strcat(destination, filename);
LOG(("download %s [%s] from %s to %s", filename, size, domain, LOG(("download %s [%s] from %s to %s", filename, size, domain,
destination)); destination));
w->fetch = fetch;
w->title = filename; w->title = filename;
w->domain = domain; w->domain = domain;
w->size = total_size; w->size = total_size;
@ -257,11 +257,11 @@ void nsws_download_clear_data(struct gui_download_window *w)
} }
void gui_download_window_data(struct gui_download_window *w, const char *data, nserror gui_download_window_data(struct gui_download_window *w, const char *data,
unsigned int size) unsigned int size)
{ {
if ((w == NULL) || (w->file == NULL)) if ((w == NULL) || (w->file == NULL))
return; return NSERROR_SAVE_FAILED;
size_t res; size_t res;
struct timeval val; struct timeval val;
res = fwrite((void *)data, 1, size, w->file); res = fwrite((void *)data, 1, size, w->file);
@ -274,6 +274,7 @@ void gui_download_window_data(struct gui_download_window *w, const char *data,
w->time_remaining = (w->progress == 0) ? -1 : w->time_remaining = (w->progress == 0) ? -1 :
(int)((val.tv_sec - w->start_time.tv_sec) * (int)((val.tv_sec - w->start_time.tv_sec) *
(10000 - w->progress) / w->progress); (10000 - w->progress) / w->progress);
return NSERROR_OK;
} }
void gui_download_window_error(struct gui_download_window *w, void gui_download_window_error(struct gui_download_window *w,

1
windows/download.h
View File

@ -53,7 +53,6 @@ struct gui_download_window {
struct timeval start_time; struct timeval start_time;
int speed; int speed;
int error; int error;
struct fetch *fetch;
struct gui_window *window; struct gui_window *window;
FILE *file; FILE *file;
download_status status; download_status status;