From: Enno Boland (tox) Date: Tue, 11 May 2010 12:57:44 +0000 (+0200) Subject: merge X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=91d04b15f0bb16d5b31ad92ea1e6a0066e589956;hp=-c;p=surf.git merge --- 91d04b15f0bb16d5b31ad92ea1e6a0066e589956 diff --combined surf.c index 2247551,eabaf17..c46e559 --- a/surf.c +++ b/surf.c @@@ -372,6 -372,8 +372,6 @@@ gboolea initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { const char *filename; char *uri; - WebKitWebBackForwardList *h; - WebKitWebHistoryItem *i; c->download = o; filename = webkit_download_get_suggested_filename(o); @@@ -380,6 -382,9 +380,6 @@@ uri = g_strconcat("file://", dldir, "/", filename, NULL); webkit_download_set_destination_uri(c->download, uri); c->progress = 0; - 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); @@@ -579,7 -584,7 +579,7 @@@ newclient(void) g_free(uri); setatom(c, findprop, ""); setatom(c, uriprop, ""); - if(!NOBACKGROUND) + if(NOBACKGROUND) webkit_web_view_set_transparent(c->view, TRUE); c->download = NULL;