X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=06767293648d35f6c522450c3be1b3f7794c1a1f;hp=94c49873032878792b1c2f032b9706eee02cad65;hb=b2a6a9673e124c222f921650a6f0025b64ab2145;hpb=021836b3da95b9243e9f8386d87d220ab4f7f7b7;ds=sidebyside

diff --git a/muttlib.c b/muttlib.c
index 94c4987..0676729 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -15,7 +15,6 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mime.h"
-#include "mailbox.h"
 #include "mx.h"
 #include "url.h"
 
@@ -23,6 +22,7 @@
 
 #ifdef USE_IMAP
 #include "imap.h"
+#include "imap/mx_imap.h"
 #endif
 
 #include "mutt_crypt.h"
@@ -364,7 +364,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
       {
 #ifdef USE_IMAP
         /* if folder = {host} or imap[s]://host/: don't append slash */
-        if (mx_is_imap (NONULL (Maildir)) &&
+        if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
             (Maildir[safe_strlen (Maildir) - 1] == '}' ||
              Maildir[safe_strlen (Maildir) - 1] == '/'))
           strfcpy (p, NONULL (Maildir), sizeof (p));
@@ -461,7 +461,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
 #ifdef USE_IMAP
   /* Rewrite IMAP path in canonical form - aids in string comparisons of
    * folders. May possibly fail, in which case s should be the same. */
-  if (mx_is_imap (s))
+  if (imap_is_magic (s, NULL) == M_IMAP)
     imap_expand_path (s, slen);
 #endif