Changeset 42672 in webkit

Timestamp:

Apr 20, 2009 10:16:20 AM (15 years ago)

Author:

kov@webkit.org

Message:

2009-04-20 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=24786
WebKitDownload sometimes suggests peculiar filenames

Remove query and ref from the URI that is to be downloaded when
using it to provide a file name suggestion.

• webkit/webkitdownload.cpp: (_WebKitDownloadPrivate::webkit_download_set_property):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitdownload.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-04-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24786
+        WebKitDownload sometimes suggests peculiar filenames
+
+        Remove query and ref from the URI that is to be downloaded when
+        using it to provide a file name suggestion.
+
+        * webkit/webkitdownload.cpp:
+        (_WebKitDownloadPrivate::webkit_download_set_property):
+
 2009-04-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/webkit/webkitdownload.cpp

@@ -187 +187 @@
     WebKitDownload* download = WEBKIT_DOWNLOAD(object);
     WebKitDownloadPrivate* priv = download->priv;
+    KURL url;
 
     switch(prop_id) {
@@ -193 +194 @@
         // This is safe as network-request is a construct only property and
         // suggestedFilename is initially null.
-        priv->suggestedFilename = g_path_get_basename(webkit_network_request_get_uri(priv->networkRequest));
+        url = KURL(KURL(), webkit_network_request_get_uri(priv->networkRequest));
+        url.setQuery(String());
+        url.removeRef();
+        priv->suggestedFilename = g_strdup(decodeURLEscapeSequences(url.lastPathComponent()).utf8().data());
         break;
     case PROP_DESTINATION_URI: