aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-folder-commands.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5d72ac4eb2..7dd91cbf36 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-15 Zbigniew Chyla <cyba@gnome.pl>
+
+ * e-shell-folder-commands.c (e_shell_command_rename_folder): Convert
+ folder name to locale's encoding before using it as part of the prompt.
+
2001-11-28 Federico Mena Quintero <federico@ximian.com>
Fixes bug #3290.
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 24c8dd2744..73ca33829f 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -510,7 +510,7 @@ e_shell_command_rename_folder (EShell *shell,
EStorageSet *storage_set;
EFolder *folder;
RenameCallbackData *callback_data;
- const char *old_name;
+ const char *old_name, *old_name_locale;
char *prompt;
char *new_name;
char *old_base_path;
@@ -533,7 +533,9 @@ e_shell_command_rename_folder (EShell *shell,
folders cannot be renamed anyway. */
old_name = g_basename (folder_path);
- prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name);
+ old_name_locale = e_utf8_to_locale_string (old_name);
+ prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name_locale);
+ g_free (old_name_locale);
while (1) {
const char *reason;