X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=06767293648d35f6c522450c3be1b3f7794c1a1f;hp=78d71032fc66325636b1a51f8bd1c5f5ef1b6b62;hb=53ceb3f257ec0af78a9129a8a565e8ca2bb03903;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/muttlib.c b/muttlib.c
index 78d7103..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
 
@@ -648,7 +648,7 @@ void mutt_free_envelope (ENVELOPE ** p)
 
 void _mutt_mktemp (char *s, const char *src, int line)
 {
-  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d", NONULL (Tempdir),
+  snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d", NONULL (Tempdir),
             NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++);
   dprint (1,
           (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));