Changeset 152155 in webkit

Timestamp:

Jun 28, 2013 1:28:54 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] MiniBrowser doesn't solve the saving location when there are no XDG settings
​https://bugs.webkit.org/show_bug.cgi?id=117538

Patch by Andres Gomez <Andres Gomez> on 2013-06-28
Reviewed by Carlos Garcia Campos.

If the XDG specification is not working for the "Downloads"
directory, let's use HOME as fallback.

• UIProcess/API/gtk/WebKitDownload.cpp:

(webkitDownloadDecideDestination):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitDownload.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-28  Andres Gomez  <agomez@igalia.com>
+
+        [GTK] MiniBrowser doesn't solve the saving location when there are no XDG settings
+        https://bugs.webkit.org/show_bug.cgi?id=117538
+
+        Reviewed by Carlos Garcia Campos.
+
+        If the XDG specification is not working for the "Downloads"
+        directory, let's use HOME as fallback.
+
+        * UIProcess/API/gtk/WebKitDownload.cpp:
+        (webkitDownloadDecideDestination):
+
 2013-06-28  Dariusz Frankiewicz  <d.frankiewic@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

@@ -115 +115 @@
 
     GOwnPtr<char> filename(g_strdelimit(g_strdup(suggestedFilename), G_DIR_SEPARATOR_S, '_'));
-    GOwnPtr<char> destination(g_build_filename(g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD), filename.get(), NULL));
+    const gchar *downloadsDir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
+    if (!downloadsDir) {
+        // If we don't have XDG user dirs info, set just to HOME.
+        downloadsDir = g_get_home_dir();
+    }
+    GOwnPtr<char> destination(g_build_filename(downloadsDir, filename.get(), NULL));
     GOwnPtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
     download->priv->destinationURI = destinationURI.get();