Prioritize the entered IMAP folder delimiter.

First priority is the connection delimiter.
Second priority is the user's delimiter if it is in imap_delim_chars.
We no longer use the first character in imap_delim_chars.

diff --git a/imap/util.c b/imap/util.c
index 45e5673ba7af5ef54a10dc50123ffddfc70aa260..2a5899856f16199629ee8c9a8a568f4feac271e4 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -393,19 +393,19 @@ char *imap_fix_path (IMAP_DATA *idata, char *mailbox, char *path,
     size_t plen)
 {
   int i = 0;
-  char delim;
+  char delim = '\0';
   
   if (idata)
     delim = idata->delim;
-  else if (ImapDelimChars && ImapDelimChars[0])
-    delim = ImapDelimChars[0];
-  else
-    delim = '/';
 
   while (mailbox && *mailbox && i < plen - 1)
   {
-    if (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
+    if (ImapDelimChars && strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
     {
+      /* use connection delimiter if known. Otherwise use user delimiter */
+      if (!delim)
+        delim = *mailbox;
+
       while (*mailbox &&
             (strchr(ImapDelimChars, *mailbox) || *mailbox == delim))
         mailbox++;