aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchenthill@novell.com>2010-11-23 23:17:15 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:04 +0800
commit344c4119a9d9a63c27ee05de38b3ed3c7761c485 (patch)
tree00ad6e1e19b92e5965a01cd4edd4e2c9e6803ef3
parentc15a75e9ab3fd69d28782f708648f3b7587cb86d (diff)
downloadgsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar.gz
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar.bz2
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar.lz
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar.xz
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.tar.zst
gsoc2013-evolution-344c4119a9d9a63c27ee05de38b3ed3c7761c485.zip
Maildir migration: allow subfolders for Inbox
-rw-r--r--mail/e-mail-migrate.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 0fb0c3e5f5..ffecec17ee 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -760,24 +760,14 @@ check_local_store_migrate (void)
return ret;
}
-/* SubFolders of Inbox are renamed to Inbox_folder_name
- Inbox does not contain any subfolders in Maildir++ format
- Folder names with '.' are converted to '_'
-*/
+/* Folder names with '.' are converted to '_' */
static gchar *
sanitize_maildir_folder_name (gchar *folder_name)
{
gchar *maildir_folder_name;
- if (!g_ascii_strcasecmp (folder_name, "Inbox"))
- maildir_folder_name = g_strdup (".");
- else if (!g_ascii_strncasecmp (folder_name, "Inbox/", 6)) {
- maildir_folder_name = g_strconcat ("Inbox_", folder_name + 6, NULL);
- g_strdelimit (maildir_folder_name, ".", '_');
- } else {
- maildir_folder_name = g_strdup (folder_name);
- g_strdelimit (maildir_folder_name, ".", '_');
- }
+ maildir_folder_name = g_strdup (folder_name);
+ g_strdelimit (maildir_folder_name, ".", '_');
return maildir_folder_name;
}