aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-01-24 17:56:44 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-01-24 17:56:44 +0800
commit180df7244c25e3034e0bf8bbc52b875ddb473816 (patch)
treecca5e34549076ff504b28ccd1297e641e232629a /embed/mozilla
parente6f14bc0bd721724d671104a719047203babb361 (diff)
downloadgsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar.gz
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar.bz2
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar.lz
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar.xz
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.tar.zst
gsoc2013-epiphany-180df7244c25e3034e0bf8bbc52b875ddb473816.zip
Add a persist-position property.
2004-01-24 Marco Pesenti Gritti <marco@gnome.org> * lib/ephy-dialog.c: (setup_default_size), (ephy_dialog_init), (ephy_dialog_set_property), (ephy_dialog_get_property), (ephy_dialog_class_init): Add a persist-position property. * embed/downloader-view.c: (downloader_view_new): Persist downloader position. * src/prefs-dialog.c: (get_download_button_label): * embed/mozilla/MozDownload.cpp: * data/epiphany.schemas.in: Default to ~/Desktop/Downloads.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/MozDownload.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 6808c0251..d6f278940 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -50,6 +50,7 @@
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
#include <libgnomevfs/gnome-vfs-utils.h>
+#include <glib/gi18n.h>
#include "nsIExternalHelperAppService.h"
#include "nsDirectoryServiceDefs.h"
@@ -537,14 +538,22 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI
static char*
GetFilePath (const char *filename)
{
- char *path, *download_dir, *expanded;
+ char *path, *download_dir, *expanded, *tmp;
download_dir = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR);
+
if (!download_dir)
{
/* Emergency download destination */
download_dir = g_strdup (g_get_home_dir ());
}
+ else if (g_utf8_collate (download_dir, "Downloads") == 0)
+ {
+ tmp = g_build_filename (g_get_home_dir (), "Desktop",
+ _("Downloads"), NULL);
+ g_free (download_dir);
+ download_dir = tmp;
+ }
expanded = gnome_vfs_expand_initial_tilde (download_dir);
path = g_build_filename (expanded, filename, NULL);