[Xfce4-commits] <midori:master> Don't manually start download from request

[Christian Dywan]

Updating branch refs/heads/master
         to 6cbf8031bfbec67437040d42ac9d2befbd438a57 (commit)
       from d2059fcec1c680a85990440c74bce6c2e9a866b6 (commit)

commit 6cbf8031bfbec67437040d42ac9d2befbd438a57
Author: Martin Natano <natano at natano.net>
Date:   Mon Apr 16 19:41:41 2012 +0200

    Don't manually start download from request
    
    See: https://bugs.launchpad.net/midori/+bug/973646

 midori/midori-browser.c |    1 -
 midori/midori-view.c    |    4 ----
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0867973..6d052f6 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1465,7 +1465,6 @@ midori_view_download_requested_cb (GtkWidget*      view,
         midori_browser_prepare_download (browser, download, destination_uri);
         g_signal_connect (download, "notify::status",
             G_CALLBACK (midori_browser_download_status_cb), GTK_WIDGET (browser));
-        webkit_download_start (download);
         g_free (destination_uri);
     }
     else if (!webkit_download_get_destination_uri (download))
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 2a6580e..c19ee02 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2971,10 +2971,6 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
         default:
             g_warn_if_reached ();
     }
-
-    /* Apparently WebKit will continue loading which ends in an error.
-       It's unclear whether it's a bug or we are doing something wrong. */
-    webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view));
     return TRUE;
 }