Merge lp:~gero-bare/midori/webkit2download-bug-1173744 into lp:midori

[Gero.Bare]

Fill in caps of WebKit2 file saving, external download manager and transfers

This branch add the download feature, adds external-download-manager and change the save page mechanism to asynchronous in midori-webkit2.

This branch breaks the download test in webkit2 only. Need further refactoring.
The branch has been build several times in webkit2 and webkit. I think that I didn't broke anything else so far.

I'm eager to listen comments.

[gue5t gue5t (gue5t)]

Cool, we do need downloads working right with wk2. :)

That said, there are numerous whitespace/style issues in the patch: added and removed blank lines, use of tab characters in files which are indented with spaces, inconsistent presence of spaces around '=', and a couple merge conflicts in the source.

The phrasing of the Aria2 error message could be clarified, and it might also do to add a comment why we are comparing against 200. Are we showing an error dialog if the website returns a non-200 status code to Aria2 (this would be poor form), or is communication between Midori and Aria2 using HTTP (please forgive my ignorance on this point)?

review: Needs Fixing

[Gero.Bare (gero-bare)]

Ok I'm working on it. I will try my best shoot.
Sorry about the tabs... I didn't check my configuration.

Yeah Aria2, this was a headache. I lost few hours till I discovered that I
not only needed the extension working and aria2 working, it sould be
running with rpc... According to the current current plug-in aria2 was
working, but I never saw the download in the Transfer nor in my file
system. After I discovered that I was receiving a null response, the
plug-in never warn me about it.

Aria2 works as a command line downloader, but also as a download manager
with an http service. You can use the later connecting you through the port
6800 by using XML or json. This is a very cool feature because you can
manage downloads via Internet. But I'm not very good using the XML service.
Probably there's a better solution.

2014-04-21 11:32 GMT-03:00 gue5t gue5t <email address hidden>:

> Review: Needs Fixing
>
> Cool, we do need downloads working right with wk2. :)
>
> That said, there are numerous whitespace/style issues in the patch: added
> and removed blank lines, use of tab characters in files which are indented
> with spaces, inconsistent presence of spaces around '=', and a couple merge
> conflicts in the source.
>
> The phrasing of the Aria2 error message could be clarified, and it might
> also do to add a comment why we are comparing against 200. Are we showing
> an error dialog if the website returns a non-200 status code to Aria2 (this
> would be poor form), or is communication between Midori and Aria2 using
> HTTP (please forgive my ignorance on this point)?
> --
>
> https://code.launchpad.net/~gero-bare/midori/webkit2download-bug-1173744/+merge/216574
> You are the owner of lp:~gero-bare/midori/webkit2download-bug-1173744.
>

[gue5t gue5t (gue5t)]

The code doesn't seem to compile at present: it needs ifdef guards moved to the outside of midori_browser_save_resources to avoid an unused function warning, it needs the unused variable file_only to be removed from midori_browser_save_midori_view, and the uri in midori_browser_save_midori_view is declared "gchar * uri" instead of "const gchar* uri".

In addition, please double-check code style; several instances of newlines are removed without code changes and tabs are added to extensions/external-download-manager.vala which is indented with spaces.

Aside the compilation (I worked around locally) and style issues, the code works well except that the "action icon" on downloads doesn't change to the "clean" broom when the download is stopped with webkit2. Almost there!

Finally, make sure you don't remove "external-download-manager.vala" from CMakeLists.txt in the final version of the branch.

review: Needs Fixing

Unmerged revisions

=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2014-03-02 16:09:22 +0000
+++ extensions/CMakeLists.txt	2014-04-26 18:11:30 +0000
@@ -18,7 +18,6 @@
          "cookie-permissions"
          "addons.c"
          "formhistory"
-         "external-download-manager.vala"
          "nojs"
          "nsplugin-manager.vala"
          )

=== 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-04-26 18:11:30 +0000
@@ -41,12 +41,17 @@
 
             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");
                 dlReq.cookie_header = this.cookie_jar.get_cookies (new Soup.URI (dlReq.uri), true);
@@ -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;
         }
     }
@@ -159,7 +168,23 @@
                 typeof(HashTable), options);
             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-04-16 21:00:49 +0000
+++ midori/midori-browser.c	2014-04-26 18:11:30 +0000
@@ -152,7 +152,11 @@
 
 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,15 +1250,16 @@
                                  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
+
 }
 
 static void
@@ -1296,6 +1301,7 @@
 #endif
 }
 
+#ifndef HAVE_WEBKIT2
 void
 midori_browser_save_uri (MidoriBrowser* browser,
                          MidoriView*    view,
@@ -1308,7 +1314,6 @@
     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);
     gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -1366,6 +1371,57 @@
     gtk_widget_destroy (dialog);
     g_list_free (resources);
 }
+#else
+void
+midori_browser_save_midori_view (MidoriBrowser* browser,
+                         MidoriView*    view)
+{
+    static gchar* last_dir = NULL;
+    GtkWidget* dialog;
+    const gchar* title = midori_view_get_display_title (view);
+    gchar* filename;
+    gboolean file_only = TRUE;
+   
+    dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Save file as"),
+        GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
+    gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+    if (last_dir && *last_dir)
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
+    else
+    {
+        gchar * uri = midori_view_get_display_uri (view);
+        gchar* dirname = midori_uri_get_folder (uri);
+        if (dirname == NULL)
+            dirname = katze_object_get_string (browser->settings, "download-folder");
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
+        g_free (dirname);
+    }
+    filename = midori_download_clean_filename (title);
+    
+    
+    gchar* suggested_filename = g_strconcat (filename, ".mhtml", 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;
+        uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+        if (uri != NULL)
+        {
+            if (uri != NULL)
+            {
+                midori_view_save_source (view, uri,false);
+            }
+            g_free (uri);
+        }
+        katze_assign (last_dir,
+            gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
+    }
+    gtk_widget_destroy (dialog);
+}
+#endif
 
 static void
 midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial,
@@ -1699,7 +1755,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 +1807,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,
@@ -2627,7 +2688,11 @@
                           MidoriBrowser* browser)
 {
     GtkWidget* view = midori_browser_get_current_tab (browser);
+    #ifndef HAVE_WEBKIT2
     midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
+    #else
+    midori_browser_save_midori_view (browser, MIDORI_VIEW (view));
+    #endif
 }
 
 static void

=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2014-03-06 22:22:37 +0000
+++ midori/midori-download.vala	2014-04-26 18:11:30 +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-04-16 23:19:21 +0000
+++ midori/midori-view.c	2014-04-26 18:11:30 +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
@@ -1988,14 +1982,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
@@ -2712,14 +2709,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,
@@ -2727,42 +2790,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));
@@ -2774,8 +2831,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 */
@@ -2816,53 +2871,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
@@ -3602,6 +3626,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)
@@ -4287,6 +4318,59 @@
         || !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
+
+#ifndef HAVE_WEBKIT2
 /**
  * midori_view_save_source:
  * @view: a #MidoriView
@@ -4305,7 +4389,6 @@
                          const gchar* outfile,
                          gboolean     use_dom)
 {
-#ifndef HAVE_WEBKIT2
     WebKitWebFrame *frame;
     WebKitWebDataSource *data_source;
     const GString *data;
@@ -4375,10 +4458,43 @@
         close (fd);
     }
     return unique_filename;
+}
 #else
-    return NULL;
+/**
+ * midori_view_save_source:
+ * @view: a #MidoriView
+ * @uri: an alternative destination URI, or %NULL
+ *
+ * Saves the data in the view to disk.
+ *
+ * Return value: the destination filename
+ *
+ * Since: 0.4.4
+ **/
+void
+midori_view_save_source (MidoriView*  view,
+                         const gchar* uri,
+                         gboolean     use_dom)
+{
+    GFile *file;
+    char * converted = NULL;
+    WebKitWebView * web_view = WEBKIT_WEB_VIEW(view->web_view);
+    g_return_if_fail (uri);
+    converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);
+    file = g_file_new_for_uri (converted);
+    if (g_str_has_suffix (uri, ".mhtml"))
+        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);
+}
 #endif
-}
 
 /**
  * midori_view_reload:
@@ -4808,4 +4924,3 @@
     midori_tab_set_fg_color (MIDORI_TAB (view), fg_color);
     midori_tab_set_bg_color (MIDORI_TAB (view), bg_color);
 }
-

=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2014-04-05 19:15:34 +0000
+++ midori/midori-view.h	2014-04-26 18:11:30 +0000
@@ -183,13 +183,18 @@
 
 gboolean
 midori_view_can_view_source            (MidoriView*        view);
-
+#ifndef HAVE_WEBKIT2
 gchar*
 midori_view_save_source                (MidoriView*        view,
                                         const gchar*       uri,
                                         const gchar*       outfile,
                                         gboolean           use_dom);
-
+#else
+void 
+midori_view_save_source                (MidoriView*        view,
+                                        const gchar*       uri,
+                                        gboolean           use_dom);
+#endif
 void
 midori_view_search_text                (MidoriView*        view,
                                         const gchar*       text,

=== 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-04-26 18:11:30 +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-04-26 18:11:30 +0000
@@ -11,6 +11,7 @@
 
 #include "midori.h"
 
+#ifndef HAVE_WEBKIT2
 static void
 browser_create (void)
 {
@@ -42,13 +43,13 @@
     midori_test_set_file_chooser_filename (temporary_filename);
     midori_settings_set_download_folder (MIDORI_SETTINGS (settings), temporary_downloads);
     midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
-
+	
     filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, FALSE);
     filename2 = g_filename_from_uri (uri, NULL, NULL);
     g_assert_cmpstr (filename, ==, filename2);
     g_free (filename);
     g_free (filename2);
-
+ 
     /* View source for local file: should NOT use temporary file */
     view = midori_browser_add_uri (browser, uri);
     midori_browser_set_current_tab (browser, view);
@@ -61,7 +62,7 @@
     g_object_unref (settings);
     g_object_unref (app);
 }
-
+#endif
 static void
 browser_tooltips (void)
 {
@@ -168,9 +169,12 @@
     #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);
+      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);