Merge lp:~evfool/midori/lp1173744 into lp:midori

[Robert Roth]

Fix webkit2 downloads based on older branch

Fix webkit2 downloads based on older branch.

Additionally fixed based on the review [1]:
* code style fixes
* use spaces instead of tabs
* fixed build errors

The only thing I did not fix was the button change on download cancel (the button of canceled download does not change to the broom), as changing that would require several changes in the Transfer class from transfers.vala, a class being moved to the core in another branch, so it would need fixing in both places (https://code.launchpad.net/~evfool/midori/coretransfer is the other branch)

[1] https://code.launchpad.net/~gero-bare/midori/webkit2download-bug-1173744
[2] https://code.launchpad.net/~gero-bare/midori/webkit2download-bug-1173744/+merge/217346/comments/517200

[Corentin Noël (tintou)]

I don't see anything wrong with the code, but the code style is sometimes not following the Midori's code style.
I've pointed out some fixes to do.

[Rico Tzschichholz (ricotz)]

I would be curious about the (not-needed?) interface changes, like:

* midori_browser_save_uri <-> midori_browser_save_midori_view
* midori_view_save_source which doesnt match its docs "Return value: the destination filename"

[Danielle Foré (danrabbit)]

I've been using this branch for the past couple days and I can confirm that it does fix the downloads issue and I haven't seen/had any additional problems/regressions running it.

[Robert Roth (evfool)]

@Rico: The interface changes are from the parent branch, but I could fix them:
* could you please be more specific about the first point, I don't understand what do you mean by "midori_browser_save_uri <-> midori_browser_save_midori_view"
* Should I remove the return value from the doc comment or should I re-add the return value to match the comment?

[Rico Tzschichholz (ricotz)]

@evfool: I am not familiar with the midori source, but for the sake of compatibility I would not change the name of internal functions while compiling against webkit1 or webkit2 if possible. So given I was just browsing through the diff here this pretty much looks like duplicating code while leading to the need to fix things on the caller-side as well. If the interface of a method is really not fitting then change it properly for all flavors if possible. In case of part of the API I would avoid it completely if things are suppose to stay stable.

[Robert Roth (evfool)]

Thanks Rico, updated the branch, different API was not needed indeed.

[RabbitBot (rabbitbot-a)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 2 Pending.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala	2014-02-18 21:15:56 +0000
+++ extensions/external-download-manager.vala	2014-07-26 22:58:18 +0000
@@ -41,11 +41,16 @@
 
             if (download_type == Midori.DownloadType.SAVE) {
                 var dlReq = new DownloadRequest ();
+
+                #if HAVE_WEBKIT2
+                dlReq.uri = download.request.get_uri ();
+                weak MessageHeaders headers = download.request.get_http_headers ();
+                #else
                 dlReq.uri = download.get_uri ();
-
                 var request = download.get_network_request ();
                 var message = request.get_message ();
                 weak MessageHeaders headers = message.request_headers;
+                #endif
 
                 dlReq.auth = headers.get ("Authorization");
                 dlReq.referer = headers.get ("Referer");
@@ -102,7 +107,11 @@
         }
 
         construct {
+            #if HAVE_WEBKIT2
+            var session= new Session ();
+            #else
             var session = WebKit.get_default_session ();
+            #endif
             this.cookie_jar = session.get_feature (typeof (CookieJar)) as CookieJar;
         }
     }
@@ -160,6 +169,22 @@
             var session = new SessionSync ();
             session.send_message (message);
 
+            /* Check if the plug-in actually recieved an reply.
+             * The parse method do not warns us about it. And the exception
+             * never is launched.*/
+            if (message.status_code != 200) {
+                var dialog = new MessageDialog (null, DialogFlags.MODAL,
+                    MessageType.ERROR, ButtonsType.CLOSE,
+                    _("The plug-in was unable to connect with aria2:\n" +
+                      "Please make sure that aria2 is running with rpc enabled ie: aria2c --enable-rpc\n" +
+                      "If it's so, check it also is using the port 6800.\n" +
+                      "Lastly Check the configuration of your firewall.\n" +
+                      "Whitelist aria2 and the port 6800 if they aren't."
+                      ));
+                dialog.response.connect ((a) => { dialog.destroy (); });
+                dialog.run ();
+            }
+
             try {
                 Value v;
                 XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v);
@@ -344,4 +369,3 @@
     extensions.add_item (new EDM.CommandLine ());
     return extensions;
 }
-

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-07-24 07:20:50 +0000
+++ midori/midori-browser.c	2014-07-26 22:58:18 +0000
@@ -153,6 +153,12 @@
 static void
 midori_browser_finalize (GObject* object);
 
+#ifdef HAVE_WEBKIT2
+void download_created_destination_cb (WebKitDownload *download,
+                                      gchar          *destination,
+                                      gpointer        user_data);
+#endif
+
 static void
 midori_browser_set_property (GObject*      object,
                              guint         prop_id,
@@ -1246,22 +1252,23 @@
                                  const gchar*    uri)
 
 {
-#ifndef HAVE_WEBKIT2
     if (!midori_download_has_enough_space (download, uri, FALSE))
         return FALSE;
+
+#ifdef HAVE_WEBKIT2
+    webkit_download_set_destination (download, uri);
+#else
     webkit_download_set_destination_uri (download, uri);
+#endif
     g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
     return TRUE;
-#else
-    return FALSE;
-#endif
 }
 
+#ifndef HAVE_WEBKIT2
 static void
 midori_browser_save_resources (GList*       resources,
                                const gchar* folder)
 {
-#ifndef HAVE_WEBKIT2
     GList* list;
     katze_mkdir_with_parents (folder, 0700);
 
@@ -1293,8 +1300,8 @@
         g_free (sub_filename);
         g_free (sub_path);
     }
+}
 #endif
-}
 
 void
 midori_browser_save_uri (MidoriBrowser* browser,
@@ -1305,9 +1312,6 @@
     GtkWidget* dialog;
     const gchar* title = midori_view_get_display_title (view);
     gchar* filename;
-    GList* resources = midori_view_get_resources (view);
-    gboolean file_only = TRUE;
-    GtkWidget* checkbox = NULL;
 
     dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Save file as"),
         GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -1316,14 +1320,6 @@
     if (uri == NULL)
         uri = midori_view_get_display_uri (view);
 
-    if (resources != NULL && g_list_nth_data (resources, 1) != NULL)
-    {
-        file_only = FALSE;
-        checkbox = gtk_check_button_new_with_mnemonic (_("Save associated _resources"));
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
-        gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox);
-    }
-
     if (last_dir && *last_dir)
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
     else
@@ -1335,6 +1331,19 @@
         g_free (dirname);
     }
 
+#ifndef HAVE_WEBKIT2
+    GList* resources = midori_view_get_resources (view);
+    gboolean file_only = TRUE;
+    GtkWidget* checkbox = NULL;
+
+    if (resources != NULL && g_list_nth_data (resources, 1) != NULL)
+    {
+        file_only = FALSE;
+        checkbox = gtk_check_button_new_with_mnemonic (_("Save associated _resources"));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
+        gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox);
+    }
+
     if (!file_only && !g_str_equal (title, uri))
         filename = midori_download_clean_filename (title);
     else
@@ -1363,8 +1372,27 @@
         katze_assign (last_dir,
             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
-    gtk_widget_destroy (dialog);
     g_list_free (resources);
+#else
+    filename = midori_download_clean_filename (title);
+    gchar* suggested_filename = g_strconcat (filename, ".mht", NULL);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename);
+
+    g_free (filename);
+    g_free (suggested_filename);
+    if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+        char *uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+        if (uri != NULL)
+        {
+            midori_view_save_source (view, uri, NULL, false);
+            g_free (uri);
+        }
+        katze_assign (last_dir,
+            gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
+    }
+#endif
+    gtk_widget_destroy (dialog);
 }
 
 static void
@@ -1699,7 +1727,6 @@
                 g_signal_connect (dialog, "destroy",
                                   G_CALLBACK (gtk_widget_destroyed), &dialog);
             }
-
             filename = midori_download_get_suggested_filename (download);
             gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
             g_free (filename);
@@ -1752,6 +1779,12 @@
     return handled;
 }
 
+void download_created_destination_cb (WebKitDownload *download,
+                                      gchar          *destination,
+                                      gpointer        user_data){
+    g_print("%s: destination %s",G_STRFUNC,destination);
+}
+
 static void
 midori_view_search_text_cb (GtkWidget*     view,
                             gboolean       found,

=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2014-03-06 22:22:37 +0000
+++ midori/midori-download.vala	2014-07-26 22:58:18 +0000
@@ -10,9 +10,7 @@
 */
 
 namespace Sokoke {
-#if !HAVE_WEBKIT2
     extern static bool message_dialog (Gtk.MessageType type, string short, string detailed, bool modal);
-#endif
 }
 
 namespace Midori {
@@ -28,6 +26,8 @@
                     return false;
             }
 #else
+            if (download.estimated_progress == 1)
+                return true;
             return false;
 #endif
         }
@@ -40,6 +40,14 @@
             download.set_data<int> ("midori-download-type", type);
         }
 
+#if HAVE_WEBKIT2
+        public static string get_filename (WebKit.Download download) {
+            return download.get_data<string> ("midori-download-filename");
+        }
+        public static void set_filename (WebKit.Download download, string name) {
+            download.set_data<string> ("midori-download-filename", name);
+        }
+#endif
         public static double get_progress (WebKit.Download download) {
 #if !HAVE_WEBKIT2
             /* Avoid a bug in WebKit */
@@ -47,7 +55,7 @@
                 return 0.0;
             return download.progress;
 #else
-            return 0.0;
+            return download.estimated_progress;
 #endif
         }
 
@@ -110,39 +118,57 @@
 
             return "%s\n%s %s%s".printf (filename, size, speed, eta);
 #else
-            return "";
+            string filename = Midori.Download.get_basename_for_display (download.destination);
+
+            string size = "%s".printf (format_size (download.get_received_data_length ()));
+            string speed = "";
+            speed = format_size ((uint64)((download.get_received_data_length () * 1.0) / download.elapsed_time));
+            speed = _(" (%s/s)").printf (speed);
+            string progress = "%d%%".printf( (int) (download.get_estimated_progress ()*100));
+            if (is_finished (download))
+                return "%s\n %s".printf (filename, size);
+            return "%s\n %s - %s".printf (filename, speed, progress);
 #endif
         }
 
         public static string get_content_type (WebKit.Download download, string? mime_type) {
-#if !HAVE_WEBKIT2
+#if HAVE_WEBKIT2
+            string? content_type = ContentType.guess (download.response.suggested_filename == null ?
+                          download.destination : download.response.suggested_filename,
+                          null, null);
+#else
             string? content_type = ContentType.guess (download.suggested_filename, null, null);
+#endif
             if (content_type == null) {
                 content_type = ContentType.from_mime_type (mime_type);
                 if (content_type == null)
                     content_type = ContentType.from_mime_type ("application/octet-stream");
             }
             return content_type;
-#else
-            return ContentType.from_mime_type ("application/octet-stream");
-#endif
         }
 
         public static bool has_wrong_checksum (WebKit.Download download) {
-#if !HAVE_WEBKIT2
             int status = download.get_data<int> ("checksum-status");
             if (status == 0) {
                 /* Link Fingerprint */
+                #if HAVE_WEBKIT2
+                string? original_uri = download.request.uri;
+                #else
                 string? original_uri = download.network_request.get_data<string> ("midori-original-uri");
                 if (original_uri == null)
                     original_uri = download.get_uri ();
+                #endif
                 string? fingerprint;
                 ChecksumType checksum_type = URI.get_fingerprint (original_uri, out fingerprint, null);
                 /* By default, no wrong checksum */
                 status = 2;
                 if (fingerprint != null) {
                     try {
+                        #if HAVE_WEBKIT2
+                        string filename = Filename.from_uri (download.destination);
+                        #else
                         string filename = Filename.from_uri (download.destination_uri);
+                        #endif
                         string contents;
                         size_t length;
                         bool y = FileUtils.get_contents (filename, out contents, out length);
@@ -158,9 +184,7 @@
                 download.set_data<int> ("checksum-status", status);
             }
             return status == 1;
-#else
-            return false;
-#endif
+
         }
 
         public static bool action_clear (WebKit.Download download, Gtk.Widget widget) throws Error {
@@ -181,6 +205,14 @@
                     warn_if_reached ();
                     break;
             }
+            #else
+
+            if (download.estimated_progress < 1) {
+                download.cancel ();
+            } else {
+                if (open (download, widget))
+                    return true;
+            }
 #endif
             return false;
         }
@@ -205,13 +237,17 @@
                     return Gtk.Stock.MISSING_IMAGE;
             }
 #else
-            return Gtk.Stock.MISSING_IMAGE;
+            if (download.estimated_progress == 1)
+                if (has_wrong_checksum (download))
+                    return Gtk.Stock.DIALOG_WARNING;
+                else
+                    return Gtk.Stock.OPEN;
+            return Gtk.Stock.CANCEL;
 #endif
         }
 
         /* returns whether an application was successfully launched to handle the file */
         public static bool open (WebKit.Download download, Gtk.Widget widget) throws Error {
-#if !HAVE_WEBKIT2
             if (has_wrong_checksum (download)) {
                 Sokoke.message_dialog (Gtk.MessageType.WARNING,
                      _("The downloaded file is erroneous."),
@@ -223,9 +259,12 @@
                 Tab? tab = null;
                 browser.get ("tab", &tab);
                 if (tab != null)
+                #if HAVE_WEBKIT2
+                    return tab.open_uri (download.destination);
+                #else
                     return tab.open_uri (download.destination_uri);
+                #endif
             }
-#endif
             return false;
         }
 
@@ -257,7 +296,10 @@
                https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */
             return clean_filename (download.get_suggested_filename ());
 #else
-            return "";
+            string name = get_filename (download);
+            if (name == null)
+                return "";
+            return name;
 #endif
         }
 

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-07-20 23:53:06 +0000
+++ midori/midori-view.c	2014-07-26 22:58:18 +0000
@@ -67,9 +67,13 @@
                             gpointer                user_data);
 
 static void
-midori_view_download_requested_cb (WebKitWebContext* context,
-                                   WebKitDownload*   download,
-                                   gpointer          user_data);
+midori_view_download_started_cb (WebKitWebContext* context,
+                                   WebKitDownload*   download,
+                                   MidoriView * view);
+static gboolean
+midori_view_download_query_action (MidoriView*     view,
+                                   WebKitDownload*   download,
+                                   const gchar * suggested_filename );
 #endif
 
 static gboolean
@@ -378,16 +382,6 @@
                                      "The associated settings",
                                      MIDORI_TYPE_WEB_SETTINGS,
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    #ifdef HAVE_WEBKIT2
-    WebKitWebContext* context = webkit_web_context_get_default ();
-    webkit_web_context_register_uri_scheme (context,
-        "res", midori_view_uri_scheme_res, NULL, NULL);
-    webkit_web_context_register_uri_scheme (context,
-        "stock", midori_view_uri_scheme_res, NULL, NULL);
-    g_signal_connect (context, "download-started",
-        (GCallback)midori_view_download_requested_cb, NULL);
-    #endif
 }
 
 static void
@@ -2008,14 +2002,17 @@
 {
 #ifdef HAVE_WEBKIT2
     WebKitDownload* download = webkit_web_view_download_uri (WEBKIT_WEB_VIEW (view->web_view), uri);
+    WebKitWebContext * web_context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
+    midori_download_set_type (download, type);
+    g_signal_emit_by_name (web_context, "download-started", download, view);
 #else
     WebKitNetworkRequest* request = webkit_network_request_new (uri);
     WebKitDownload* download = webkit_download_new (request);
     g_object_unref (request);
-#endif
+    midori_download_set_type (download, type);
     gboolean handled;
-    midori_download_set_type (download, type);
     g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+    #endif
 }
 
 static void
@@ -2732,14 +2729,80 @@
 }
 #endif
 
+gint
+midori_save_dialog (const gchar* title,
+                    const gchar * hostname,
+                    const GString* details,
+                    const gchar *content_type)
+{   
+    GIcon* icon;
+    GtkWidget* image;
+    GdkScreen* screen;
+    GtkWidget* dialog= NULL;
+    GtkIconTheme* icon_theme;
+    gint response;
+    dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+        _("Open or download file from %s"), hostname);
+    icon = g_content_type_get_icon (content_type);
+    g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+    gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
+    g_object_unref (icon);
+    gtk_widget_show (image);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+        "%s", details->str);
+    screen = gtk_widget_get_screen (dialog);
+    
+    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+    if (screen)
+    {
+        icon_theme = gtk_icon_theme_get_for_screen (screen);
+        if (gtk_icon_theme_has_icon (icon_theme, MIDORI_STOCK_TRANSFER))
+            gtk_window_set_icon_name (GTK_WINDOW (dialog), MIDORI_STOCK_TRANSFER);
+        else
+            gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN);
+    }
+    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+        GTK_STOCK_SAVE, MIDORI_DOWNLOAD_SAVE,
+        GTK_STOCK_SAVE_AS, MIDORI_DOWNLOAD_SAVE_AS,
+        GTK_STOCK_CANCEL, MIDORI_DOWNLOAD_CANCEL,
+        GTK_STOCK_OPEN, MIDORI_DOWNLOAD_OPEN,
+        NULL);
+
+    response = midori_dialog_run (GTK_DIALOG (dialog));
+    
+    gtk_widget_destroy (dialog);
+    if (response == GTK_RESPONSE_DELETE_EVENT)
+        response = MIDORI_DOWNLOAD_CANCEL;
+    return response;
+}
+
 #ifdef HAVE_WEBKIT2
+static gboolean
+midori_view_download_decide_destination_cb (WebKitDownload*   download,
+                                    const gchar * suggested_filename,
+                                    MidoriView*      view)
+{
+    if(!midori_view_download_query_action (view, download, suggested_filename)) {
+        webkit_download_cancel (download);
+    }
+    return TRUE;    //we must return TRUE because we handled the signal
+}
+                
 static void
-midori_view_download_requested_cb (WebKitWebContext* context,
-                                   WebKitDownload*   download,
-                                   gpointer          user_data)
-{
-    WebKitWebView* web_view = webkit_download_get_web_view (download);
-    MidoriView* view = midori_view_get_for_widget (GTK_WIDGET (web_view));
+midori_view_download_started_cb (WebKitWebContext* context,
+                                   WebKitDownload*   download,
+                                   MidoriView          *view)
+{
+    g_signal_connect (download, "decide-destination",
+                      G_CALLBACK (midori_view_download_decide_destination_cb), view);
+}
+
+static gboolean
+midori_view_download_query_action (MidoriView* view,
+                                   WebKitDownload*   download,
+                                   const gchar * suggested_filename)
+{
 #else
 static gboolean
 midori_view_download_requested_cb (GtkWidget*      web_view,
@@ -2747,42 +2810,36 @@
                                    MidoriView*     view)
 {
 #endif
-    gchar* opener_uri;
+    gboolean handled = TRUE;
     gchar* hostname;
-    GtkWidget* dialog;
     gchar* content_type;
     gchar* description;
+    gchar* title;
+    gint response;
     GString* details;
-    GIcon* icon;
-    GtkWidget* image;
-    gchar* title;
-    GdkScreen* screen;
-    GtkIconTheme* icon_theme;
-    gint response;
-    gboolean handled;
-
     /* Opener may differ from displaying view:
        http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ */
-    opener_uri = g_object_get_data (G_OBJECT (view), "opener-uri");
+    const gchar* opener_uri = g_object_get_data (G_OBJECT (view), "opener-uri");
     hostname = midori_uri_parse_hostname (
         opener_uri ? opener_uri : midori_view_get_display_uri (view), NULL);
-    dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-        _("Open or download file from %s"), hostname);
-    g_free (hostname);
+    
+    #ifdef HAVE_WEBKIT2
+    content_type = g_content_type_guess (suggested_filename, NULL ,
+                                            0 ,NULL);
+    if (!content_type)
+        content_type = g_strdup ("application/octet-stream");
+    midori_download_set_filename (download, g_strdup (suggested_filename));
+    #else
     content_type = midori_download_get_content_type (download,
         g_object_get_data (G_OBJECT (view), "download-mime-type"));
+    #endif
     description = g_content_type_get_description (content_type);
-    icon = g_content_type_get_icon (content_type);
-    g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
-    g_object_unref (icon);
-    gtk_widget_show (image);
-    gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
 
     details = g_string_sized_new (20 * 4);
     #ifdef HAVE_WEBKIT2
+    const gchar * suggestion = webkit_uri_response_get_suggested_filename (webkit_download_get_response (download));
     g_string_append_printf (details, _("File Name: %s"),
-        webkit_uri_response_get_suggested_filename (webkit_download_get_response (download)));
+                suggestion ? suggestion : suggested_filename);
     #else
     g_string_append_printf (details, _("File Name: %s"),
         webkit_download_get_suggested_filename (download));
@@ -2794,8 +2851,6 @@
     else
         g_string_append_printf (details, _("File Type: %s ('%s')"), description, content_type);
     g_string_append_c (details, '\n');
-    g_free (description);
-    g_free (content_type);
 
     #ifndef HAVE_WEBKIT2
     /* Link Fingerprint */
@@ -2836,53 +2891,22 @@
     }
     #endif
 
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-        "%s", details->str);
-    g_string_free (details, TRUE);
-
-    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
     #ifdef HAVE_WEBKIT2
     /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */
     title = g_strdup_printf (_("Open %s"), webkit_uri_request_get_uri (webkit_download_get_request (download)));
     #else
     title = g_strdup_printf (_("Open %s"), webkit_download_get_uri (download));
     #endif
-    gtk_window_set_title (GTK_WINDOW (dialog), title);
+    response = midori_save_dialog (title,
+            hostname, details, content_type); //We prompt a dialog
     g_free (title);
-    screen = gtk_widget_get_screen (dialog);
-    if (screen)
-    {
-        icon_theme = gtk_icon_theme_get_for_screen (screen);
-        if (gtk_icon_theme_has_icon (icon_theme, MIDORI_STOCK_TRANSFER))
-            gtk_window_set_icon_name (GTK_WINDOW (dialog), MIDORI_STOCK_TRANSFER);
-        else
-            gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN);
-    }
-    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-        GTK_STOCK_SAVE, MIDORI_DOWNLOAD_SAVE,
-        GTK_STOCK_SAVE_AS, MIDORI_DOWNLOAD_SAVE_AS,
-        GTK_STOCK_CANCEL, MIDORI_DOWNLOAD_CANCEL,
-        GTK_STOCK_OPEN, MIDORI_DOWNLOAD_OPEN,
-        NULL);
-
-    response = midori_dialog_run (GTK_DIALOG (dialog));
-    gtk_widget_destroy (dialog);
-    if (response == GTK_RESPONSE_DELETE_EVENT)
-        response = MIDORI_DOWNLOAD_CANCEL;
+    g_free (hostname);
+    g_free (description);
+    g_free (content_type);
+    g_string_free (details, TRUE);
     midori_download_set_type (download, response);
-
-    /* TODO
-    g_object_connect (download,
-        "signal::decide-destination", download_decide_destination_cb, view,
-        "signal::created-destination", download_created_destination_cb, view,
-        "signal::finished", download_finished_cb, view,
-        "signal::failed", download_failed_cb, view,
-        NULL);
-    */
     g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
-#ifndef HAVE_WEBKIT2
     return handled;
-#endif
 }
 
 #ifndef HAVE_WEBKIT2
@@ -3622,6 +3646,13 @@
         g_signal_connect (view->web_view, "web-process-crashed",
             (GCallback)midori_view_web_view_crashed_cb, view);
     view->scrolled_window = view->web_view;
+    WebKitWebContext* context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
+    webkit_web_context_register_uri_scheme (context,
+        "res", midori_view_uri_scheme_res, NULL, NULL);
+    webkit_web_context_register_uri_scheme (context,
+        "stock", midori_view_uri_scheme_res, NULL, NULL);
+    g_signal_connect (context, "download-started",
+        G_CALLBACK (midori_view_download_started_cb), view);
     #endif
 
     #if GTK_CHECK_VERSION(3, 2, 0)
@@ -4307,6 +4338,58 @@
         || !g_str_has_prefix (midori_tab_get_mime_type (MIDORI_TAB (view)), "image/"));
 }
 
+#ifdef HAVE_WEBKIT2
+static void
+midori_web_resource_get_data_cb (WebKitWebResource *resource,
+                          GAsyncResult *result,
+                          GOutputStream *output_stream)
+{
+    guchar *data;
+    gsize data_length;
+    GInputStream *input_stream;
+    GError *error = NULL;
+
+    data = webkit_web_resource_get_data_finish (resource, result, &data_length, &error);
+    if (!data) {
+        g_printerr ("Failed to save page: %s", error->message);
+        g_error_free (error);
+        g_object_unref (output_stream);
+
+        return;
+    }
+
+    input_stream = g_memory_input_stream_new_from_data (data, data_length, g_free);
+    g_output_stream_splice_async (output_stream, input_stream,
+                                G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
+                                G_PRIORITY_DEFAULT,
+                                NULL, NULL, NULL);
+    g_object_unref (input_stream);
+    g_object_unref (output_stream);
+}
+
+static void
+midori_web_view_save_main_resource_cb (GFile *file,
+                                     GAsyncResult *result,
+                                     WebKitWebView *view)
+{
+    GFileOutputStream *output_stream;
+    WebKitWebResource *resource;
+    GError *error = NULL;
+
+    output_stream = g_file_replace_finish (file, result, &error);
+    if (!output_stream) {
+        g_printerr ("Failed to save page: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+
+    resource = webkit_web_view_get_main_resource (view);
+    webkit_web_resource_get_data (resource, NULL,
+                                (GAsyncReadyCallback)midori_web_resource_get_data_cb,
+                                output_stream);                                
+} 
+#endif
+
 /**
  * midori_view_save_source:
  * @view: a #MidoriView
@@ -4325,6 +4408,14 @@
                          const gchar* outfile,
                          gboolean     use_dom)
 {
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+    
+    if (uri == NULL)
+        uri = midori_view_get_display_uri (view);
+
+    if (g_str_has_prefix (uri, "file:///"))
+        return g_filename_from_uri (uri, NULL, NULL);
+
 #ifndef HAVE_WEBKIT2
     WebKitWebFrame *frame;
     WebKitWebDataSource *data_source;
@@ -4334,8 +4425,6 @@
     FILE* fp;
     size_t ret;
 
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
     frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
 
     if (use_dom)
@@ -4356,12 +4445,6 @@
         data = webkit_web_data_source_get_data (data_source);
     }
 
-    if (uri == NULL)
-        uri = midori_view_get_display_uri (view);
-
-    if (g_str_has_prefix (uri, "file:///"))
-        return g_filename_from_uri (uri, NULL, NULL);
-
     if (!outfile)
     {
         gchar* extension = midori_download_get_extension_for_uri (uri, NULL);
@@ -4396,7 +4479,30 @@
     }
     return unique_filename;
 #else
-    return NULL;
+    GFile *file;
+    char *converted = NULL;
+    WebKitWebView * web_view = WEBKIT_WEB_VIEW (view->web_view);
+    g_return_if_fail (uri);
+
+    if (!outfile)
+        converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);
+    else
+        converted = g_strdup (outfile);
+
+    file = g_file_new_for_uri (converted);
+
+    if (g_str_has_suffix (uri, ".mht"))
+        webkit_web_view_save_to_file (WEBKIT_WEB_VIEW (web_view), file, WEBKIT_SAVE_MODE_MHTML,
+                                  NULL, NULL, NULL);
+    else
+        g_file_replace_async (file, NULL, FALSE,
+                          G_FILE_CREATE_REPLACE_DESTINATION | G_FILE_CREATE_PRIVATE,
+                          G_PRIORITY_DEFAULT, NULL,
+                          (GAsyncReadyCallback)midori_web_view_save_main_resource_cb,
+                          web_view);
+    g_free (converted);
+    g_object_unref (file);
+    return converted;
 #endif
 }
 
@@ -4828,4 +4934,3 @@
     midori_tab_set_fg_color (MIDORI_TAB (view), fg_color);
     midori_tab_set_bg_color (MIDORI_TAB (view), bg_color);
 }
-

=== modified file 'midori/webkit2gtk-3.0.vapi'
--- midori/webkit2gtk-3.0.vapi	2014-03-14 22:22:29 +0000
+++ midori/webkit2gtk-3.0.vapi	2014-07-26 22:58:18 +0000
@@ -81,7 +81,7 @@
 		public async Cairo.Surface? get_favicon (string page_uri, GLib.Cancellable? cancellable) throws GLib.Error;
 		public string? get_favicon_uri (string page_uri);
 		public void clear ();
-	}
+	} 
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_download_get_type ()")]
 	public class Download : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -95,8 +95,10 @@
 		public unowned WebKit.URIResponse get_response ();
 		public void set_destination (string uri);
 		public string destination { get; }
+		public double elapsed_time{ get; }
 		public double estimated_progress { get; }
 		public WebKit.URIResponse response { get; }
+		public WebKit.URIRequest request{ get; }
 		public signal bool created_destination (string destination);
 		public virtual signal bool decide_destination (string suggested_filename);
 		public signal void failed (void* error);
@@ -395,6 +397,7 @@
 		public URIRequest (string uri);
 		public unowned string get_uri ();
 		public string uri { get; construct; }
+		public unowned Soup.MessageHeaders get_http_headers ();
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_uri_response_get_type ()")]
 	public class URIResponse : GLib.Object {
@@ -403,12 +406,14 @@
 		public uint64 get_content_length ();
 		public bool get_https_status (out unowned GLib.TlsCertificate certificate, out GLib.TlsCertificateFlags errors);
 		public unowned string get_mime_type ();
+		public unowned string get_suggested_filename ();
 		public uint get_status_code ();
 		public unowned string get_uri ();
 		public uint64 content_length { get; }
 		public string mime_type { get; }
 		public uint status_code { get; }
 		public string uri { get; }
+		public string suggested_filename { get; }
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_uri_scheme_request_get_type ()")]
 	public class URISchemeRequest : GLib.Object {

=== modified file 'tests/browser.c'
--- tests/browser.c	2013-11-04 16:08:35 +0000
+++ tests/browser.c	2014-07-26 22:58:18 +0000
@@ -11,6 +11,7 @@
 
 #include "midori.h"
 
+#ifndef HAVE_WEBKIT2
 static void
 browser_create (void)
 {
@@ -61,6 +62,7 @@
     g_object_unref (settings);
     g_object_unref (app);
 }
+#endif
 
 static void
 browser_tooltips (void)
@@ -168,9 +170,9 @@
     #ifndef HAVE_WEBKIT2
     g_object_set_data (G_OBJECT (webkit_get_default_session ()),
                        "midori-session-initialized", (void*)1);
-    #endif
-
     g_test_add_func ("/browser/create", browser_create);
+    #endif                   
+
     g_test_add_func ("/browser/tooltips", browser_tooltips);
     g_test_add_func ("/browser/site_data", browser_site_data);
     g_test_add_func ("/browser/block_uris", browser_block_uris);