convert plugin: Fixed changing hierarchy separators in mailbox names when alt_hierarc...

--HG--
branch : HEAD

diff --git a/src/plugins/convert/convert-storage.c b/src/plugins/convert/convert-storage.c
index c2abc4b3aa47993223dfebe15c9d342dc1aec275..497307354116f0f30392e84cf9862d26a211aacf 100644 (file)
--- a/src/plugins/convert/convert-storage.c
+++ b/src/plugins/convert/convert-storage.c
@@ -110,12 +110,12 @@ mailbox_name_convert(struct mail_namespace *dest_ns,
        src_sep = mailbox_list_get_hierarchy_sep(source_ns->list);
        dest_sep = mailbox_list_get_hierarchy_sep(dest_ns->list);
 
-       if (src_sep == dest_sep || set->alt_hierarchy_char == '\0')
+       if (src_sep == dest_sep)
                return name;
 
        dest_name = t_strdup_noconst(name);
        for (p = dest_name; *p != '\0'; p++) {
-               if (*p == dest_sep)
+               if (*p == dest_sep && set->alt_hierarchy_char != '\0')
                        *p = set->alt_hierarchy_char;
                else if (*p == src_sep)
                        *p = dest_sep;