aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@src.gnome.org>2003-12-21 01:01:23 +0800
committerChristian Neumair <cneumair@src.gnome.org>2003-12-21 01:01:23 +0800
commitc822c32d2e71cc462ca79903e5bccbdbea658408 (patch)
treeabdc8710893951ed2ab39794baec619336bd528b
parentc1563eced7a53f75f6dbddbba78a9245723e3b26 (diff)
downloadgsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar.gz
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar.bz2
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar.lz
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar.xz
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.tar.zst
gsoc2013-epiphany-c822c32d2e71cc462ca79903e5bccbdbea658408.zip
Fixed #129737.
-rw-r--r--ChangeLog7
-rw-r--r--src/prefs-dialog.c15
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ceba810e6..5ae664f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-20 Christian Neumair <chris@gnome-de.org>
+
+ * src/prefs-dialog.c: (get_download_button_label):
+
+ Set the download folder selection label to "Home" if download folder
+ is home folder (#129737).
+
2003-12-20 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-gui.c: (ephy_gui_menu_position_under_widget):
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 36f875587..75f26dc79 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1076,23 +1076,36 @@ create_language_section (EphyDialog *dialog)
static char*
get_download_button_label ()
{
- char *label, *key, *desktop_path, *tmp;
+ char *label, *key, *desktop_path, *home_path, *tmp;
key = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR);
+
tmp = g_build_filename (g_get_home_dir (), "Desktop", NULL);
desktop_path = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
+ home_path = g_filename_to_utf8 (g_get_home_dir (), -1, NULL, NULL, NULL);
g_free (tmp);
+
if (g_utf8_collate (key, desktop_path) == 0)
{
g_free (key);
label = g_strdup (_("Desktop"));
}
+ else if (g_utf8_collate (key, home_path) == 0)
+ {
+ g_free (key);
+ /* Note that this does NOT refer to the home page but to a
+ * user's home folder. It should be translated by the same
+ * term as GTK+'s "Home" string to be consistent with the
+ * filechooser */
+ label = g_strdup (_("Home"));
+ }
else
{
label = key;
}
g_free (desktop_path);
+ g_free (home_path);
return label;
}