From daf9595797776944cc11626c7ac0c444a0602090 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 12 Feb 2004 20:08:25 +0000 Subject: Unify fallback downloads dir to get the home directory. 2004-02-12 Christian Persch * embed/mozilla/MozDownload.cpp: * src/prefs-dialog.c: (get_download_button_label): Unify fallback downloads dir to get the home directory. --- src/prefs-dialog.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/prefs-dialog.c') diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 9b0a228a4..398b90a89 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -1093,17 +1093,7 @@ get_download_button_label () downloads_path = ephy_file_downloads_dir (); converted_dp = g_filename_to_utf8 (downloads_path, -1, NULL, NULL, NULL); - if (key == NULL || - g_utf8_collate (key, converted_dp) == 0 || - g_utf8_collate (key, "Downloads") == 0) - { - label = g_strdup (_("Downloads")); - } - else if (g_utf8_collate (key, "~/Desktop") == 0) - { - label = g_strdup (_("Desktop")); - } - else if (g_utf8_collate (key, "~") == 0) + if (key == NULL || g_utf8_collate (key, "~") == 0) { /* Note that this does NOT refer to the home page but to a * user's home folder. It should be translated by the same @@ -1111,6 +1101,15 @@ get_download_button_label () * filechooser */ label = g_strdup (_("Home")); } + else if ((converted_dp != NULL && g_utf8_collate (key, converted_dp) == 0) || + g_utf8_collate (key, "Downloads") == 0) + { + label = g_strdup (_("Downloads")); + } + else if (g_utf8_collate (key, "~/Desktop") == 0) + { + label = g_strdup (_("Desktop")); + } else { label = g_strdup (key); -- cgit