Allow ImapDelimChars to be unset

diff --git a/ChangeLog b/ChangeLog
index eb59cdbee882cc317ab6597a5351a12b2a77d656..9812d30296de5781ddbabab92c223a010537da3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2009-06-28 16:00 -0700  Brendan Cully  <brendan@kublai.com>  (de948f407a1b)
+2009-06-28 19:21 -0700  Brendan Cully  <brendan@kublai.com>  (ef6523d11f24)
+
+       * mutt.h: Rename struct thread to struct mutt_thread. Closes #3279.
+
+       * imap/command.c: Not being able to start an IMAP command
+       is a fatal error. Closes #3155.
 
        * imap/auth_login.c: IMAP LOGIN does not support separate user and
        login accounts. Use the user account for both. Closes #3240.

diff --git a/imap/util.c b/imap/util.c
index 2e1dfc3282da9a555302ab5dd4a93d2977f9c41f..48ba630b0cf1efae502254974597f301a1b4bbfa 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -316,7 +316,7 @@ void imap_pretty_mailbox (char* path)
     {
       if (! hlen)
        home_match = 1;
-      else
+      else if (ImapDelimChars)
        for (delim = ImapDelimChars; *delim != '\0'; delim++)
          if (target.mbox[hlen] == *delim)
            home_match = 1;
@@ -421,14 +421,15 @@ char *imap_fix_path (IMAP_DATA *idata, const char *mailbox, char *path,
   while (mailbox && *mailbox && i < plen - 1)
   {
     if ((ImapDelimChars && strchr(ImapDelimChars, *mailbox))
-        || *mailbox == delim)
+        || (delim && *mailbox == delim))
     {
       /* use connection delimiter if known. Otherwise use user delimiter */
       if (!idata)
         delim = *mailbox;
 
-      while (*mailbox &&
-            (strchr(ImapDelimChars, *mailbox) || *mailbox == delim))
+      while (*mailbox
+            && ((ImapDelimChars && strchr(ImapDelimChars, *mailbox))
+                || (delim && *mailbox == delim)))
         mailbox++;
       path[i] = delim;
     }