[hackers] [surf] fixing downloads || Enno Boland (tox)

changeset: 185:44f3fe3f0391
tag: tip
user: Enno Boland (tox) <tox_AT_s01.de>
date: Wed Mar 24 23:18:03 2010 +0100
files: surf.c
description:
fixing downloads

diff -r 515c459dd475 -r 44f3fe3f0391 surf.c
--- a/surf.c Wed Mar 24 22:04:36 2010 +0100
+++ b/surf.c Wed Mar 24 23:18:03 2010 +0100
@@ -263,6 +263,7 @@
         r = webkit_network_request_new(uri);
         dl = webkit_download_new(r);
         initdownload(c->view, dl, c);
+ webkit_download_start(c->download);
 }
 
 void
@@ -352,11 +353,10 @@
 gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
         const char *filename;
- char *uri, *html;
+ char *uri;
         WebKitWebBackForwardList *h;
         WebKitWebHistoryItem *i;
 
- stop(c, NULL);
         c->download = o;
         filename = webkit_download_get_suggested_filename(o);
         if(!strcmp("", filename))
@@ -364,20 +364,14 @@
         uri = g_strconcat("file://", dldir, "/", filename, NULL);
         webkit_download_set_destination_uri(c->download, uri);
         c->progress = 0;
- g_free(uri);
- html = g_strdup_printf("Download <b>%s</b>...", filename);
- webkit_web_view_load_html_string(c->view, html,
- webkit_download_get_uri(c->download));
         h = webkit_web_view_get_back_forward_list(c->view);
         i = webkit_web_history_item_new_with_data(webkit_download_get_uri(c->download), filename);
         webkit_web_back_forward_list_add_item(h, i);
         g_signal_connect(c->download, "notify::progress", G_CALLBACK(updatedownload), c);
         g_signal_connect(c->download, "notify::status", G_CALLBACK(updatedownload), c);
- webkit_download_start(c->download);
         
         c->title = copystr(&c->title, filename);
         update(c);
- g_free(html);
         return TRUE;
 }
 
@@ -422,6 +416,8 @@
 
 void
 loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
+ if(c->download)
+ stop(c, NULL);
         switch(webkit_web_view_get_load_status (c->view)) {
         case WEBKIT_LOAD_COMMITTED:
                 setatom(c, uriprop, geturi(c));
@@ -827,6 +823,8 @@
         if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
                 c->progress = (gint)(webkit_download_get_progress(c->download)*100);
         }
+ else
+ stop(c, NULL);
         update(c);
 }
 
Received on Wed Mar 24 2010 - 22:16:44 UTC