From 180df7244c25e3034e0bf8bbc52b875ddb473816 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 24 Jan 2004 09:56:44 +0000 Subject: Add a persist-position property. 2004-01-24 Marco Pesenti Gritti * 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. --- embed/mozilla/MozDownload.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'embed/mozilla') 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 +#include #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); -- cgit v1.2.3