aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--data/epiphany.schemas.in14
-rw-r--r--lib/ephy-prefs.h2
-rw-r--r--src/ephy-tab.c2
-rw-r--r--src/popup-commands.c2
5 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 48893bc6d..8596392a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-01-23 Marco Pesenti Gritti <marco@gnome.org>
+
+ * data/epiphany.schemas.in:
+ * lib/ephy-prefs.h:
+ * src/ephy-tab.c: (ephy_tab_dom_mouse_click_cb):
+ * src/popup-commands.c: (save_property_url):
+
+ Sometimes reading gnomedesktop flames is useful:
+
+ Do not use the same pref of 1.0 for the download dir.
+ Use a different key for Save Link As.
+
2004-01-23 Christian Persch <chpe@cvs.gnome.org>
* embed/downloader-view.c: (downloader_view_build_ui):
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 283901f71..01302e149 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -401,20 +401,22 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/epiphany/directories/download</key>
- <applyto>/apps/epiphany/directories/download</applyto>
+ <key>/schemas/apps/epiphany/directories/upload</key>
+ <applyto>/apps/epiphany/directories/upload</applyto>
<owner>epiphany</owner>
<type>string</type>
- <default>~/Downloads</default>
+ <default>~</default>
<locale name="C">
</locale>
</schema>
<schema>
- <key>/schemas/apps/epiphany/directories/upload</key>
- <applyto>/apps/epiphany/directories/upload</applyto>
+ <key>/schemas/apps/epiphany/directories/downloads_folder</key>
+ <applyto>/apps/epiphany/directories/downloads_folder</applyto>
<owner>epiphany</owner>
<type>string</type>
- <default>~</default>
+ <default>~/Downloads</default>
+ <short>The downloads folder</short>
+ <long>The path of the folder where downloads are saved.</long>
<locale name="C">
</locale>
</schema>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 578e97bb1..0b0374da1 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
#define CONF_STATE_SAVE_DIR "/apps/epiphany/directories/save"
#define CONF_STATE_SAVE_IMAGE_DIR "/apps/epiphany/directories/saveimage"
#define CONF_STATE_OPEN_DIR "/apps/epiphany/directories/open"
-#define CONF_STATE_DOWNLOAD_DIR "/apps/epiphany/directories/download"
+#define CONF_STATE_DOWNLOAD_DIR "/apps/epiphany/directories/downloads_folder"
#define CONF_STATE_UPLOAD_DIR "/apps/epiphany/directories/upload"
/* Lockdown */
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 7f130147c..ea8c4f612 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -1064,7 +1064,7 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed,
/* shift+click saves the link target */
else if (is_link && is_left_click && with_shift)
{
- save_property_url (embed, event, "link", CONF_STATE_DOWNLOAD_DIR);
+ save_property_url (embed, event, "link", CONF_STATE_SAVE_DIR);
}
/* shift+click saves the non-link image
* Note: pressing enter to submit a form synthesizes a mouse click event
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 666492659..8839e1935 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -295,7 +295,7 @@ save_property_url (GtkAction *action,
ephy_embed_persist_set_flags
(persist, ask_dest ? EMBED_PERSIST_ASK_DESTINATION : 0);
ephy_embed_persist_set_persist_key
- (persist, CONF_STATE_DOWNLOAD_DIR);
+ (persist, CONF_STATE_SAVE_DIR);
ephy_embed_persist_set_source (persist, location);
ephy_embed_persist_save (persist);