3 files changed, 44 insertions, 1 deletions
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 4ce3b38d4..faf94ed9b 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -111,7 +111,7 @@ ephy_file_chooser_constructor (GType type,
 	object = parent_class->constructor (type, n_construct_properties,
 					    construct_params);
 
-	downloads_dir = ephy_file_downloads_dir ();
+	downloads_dir = ephy_file_get_downloads_dir ();
 	gtk_file_chooser_add_shortcut_folder
 		(GTK_FILE_CHOOSER (object), downloads_dir, NULL);
 	g_free (downloads_dir);
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 45278b31a..db8950f20 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -108,6 +108,47 @@ ephy_file_downloads_dir (void)
 }
 
 char *
+ephy_file_get_downloads_dir (void)
+{
+	char *path = NULL, *download_dir, *home_dir, *expanded;
+
+	download_dir = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR);
+
+	if (download_dir && strcmp (download_dir, "Downloads") == 0)
+	{
+		g_free (download_dir);
+		download_dir = ephy_file_downloads_dir ();
+	}
+  	else if (download_dir && strcmp (download_dir, "Desktop") == 0)
+	{
+		g_free (download_dir);
+		download_dir = ephy_file_desktop_dir ();
+	}  
+	else if (download_dir)
+	{
+		char *converted_dp;
+
+		converted_dp = g_filename_from_utf8 (download_dir, -1, NULL, NULL, NULL);
+		g_free (download_dir);
+		download_dir = converted_dp;
+	}
+
+	/* Emergency download destination */
+	if (download_dir == NULL)
+	{
+		home_dir = g_get_home_dir ();
+		download_dir = g_strdup (home_dir != NULL ? home_dir : "/");
+	}
+
+	g_return_val_if_fail (download_dir != NULL, NULL);
+
+	expanded = gnome_vfs_expand_initial_tilde (download_dir);
+	g_free (download_dir);
+
+	return expanded;
+}
+
+char *
 ephy_file_desktop_dir (void)
 {
 	char *downloads_dir;
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index 81fdd90f5..2e5b7f111 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -45,6 +45,8 @@ void        ephy_file_helpers_shutdown   (void);
 
 char       *ephy_file_downloads_dir      (void);
 
+char	   *ephy_file_get_downloads_dir	 (void);
+
 char       *ephy_file_desktop_dir	 (void);
 
 const char *ephy_file_tmp_dir	 	 (void);