Fix last commit

diff --git a/ChangeLog b/ChangeLog
index 5875da1e3050c4dcf262b44bdd15778b7074d89f..cb8fcd214b87fb1746c3443131983ba85900bbea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-10 17:47 -0800  Brendan Cully  <brendan@kublai.com>  (d6ee34f3ccaf)
+
+       * imap/util.c: 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.
+
+2009-01-06 18:34 -0800  Vsevolod Volkov  <vvv@mutt.org.ua>  (4032dfd52118)
+
+       * po/ru.po: Updated Russian translation
+
 2009-01-05 16:43 -0800  Brendan Cully  <brendan@kublai.com>  (0d81ef9d40fd)
 
        * build-release: Sign tagged revision, not the one after

diff --git a/imap/util.c b/imap/util.c
index 2a5899856f16199629ee8c9a8a568f4feac271e4..db9e3a76281a523f88b4acd7b4b1e23e2e8ebb77 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -400,10 +400,11 @@ char *imap_fix_path (IMAP_DATA *idata, char *mailbox, char *path,
 
   while (mailbox && *mailbox && i < plen - 1)
   {
-    if (ImapDelimChars && strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
+    if ((ImapDelimChars && strchr(ImapDelimChars, *mailbox))
+        || *mailbox == delim)
     {
       /* use connection delimiter if known. Otherwise use user delimiter */
-      if (!delim)
+      if (!idata)
         delim = *mailbox;
 
       while (*mailbox &&