diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-01-19 08:11:35 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-01-19 08:11:35 +0800 |
| commit | bc344d71c648e9985122fad66b6cab941b32f188 (patch) | |
| tree | 1ceb0dfd2e6cc725894e03502dfea5282388dbb0 /embed/mozilla/MozDownload.cpp | |
| parent | 5532d7831fe768cbf8100c84668291dc707ef1fb (diff) | |
| download | gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar.gz gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar.bz2 gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar.lz gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar.xz gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.tar.zst gsoc2013-epiphany-bc344d71c648e9985122fad66b6cab941b32f188.zip | |
*** empty log message ***
Diffstat (limited to 'embed/mozilla/MozDownload.cpp')
| -rw-r--r-- | embed/mozilla/MozDownload.cpp | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 31847a3e1..53205702a 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -491,7 +491,7 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI static char* GetFilePath (const char *filename) { - char *path, *download_dir; + char *path, *download_dir, *expanded; download_dir = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR); if (!download_dir) @@ -500,31 +500,10 @@ GetFilePath (const char *filename) download_dir = g_strdup (g_get_home_dir ()); } - if (!strcmp (download_dir, "Desktop")) - { - if (eel_gconf_get_boolean (CONF_DESKTOP_IS_HOME_DIR)) - { - path = g_build_filename - (g_get_home_dir (), - filename, - NULL); - } - else - { - path = g_build_filename - (g_get_home_dir (), "Desktop", - filename, - NULL); - } - } - else - { - char *expanded; + expanded = gnome_vfs_expand_initial_tilde (download_dir); + path = g_build_filename (expanded, filename, NULL); + g_free (expanded); - expanded = gnome_vfs_expand_initial_tilde (download_dir); - path = g_build_filename (expanded, filename, NULL); - g_free (expanded); - } g_free (download_dir); return path; |