#include "mutt.h"
#include "mutt_curses.h"
#include "mime.h"
-#include "mailbox.h"
#include "mx.h"
#include "url.h"
{
#ifdef USE_IMAP
/* if folder = {host} or imap[s]://host/: don't append slash */
- if (mx_is_imap (NONULL (Maildir)) &&
+ if (mx_get_magic (NONULL (Maildir)) == M_IMAP &&
(Maildir[safe_strlen (Maildir) - 1] == '}' ||
Maildir[safe_strlen (Maildir) - 1] == '/'))
strfcpy (p, NONULL (Maildir), sizeof (p));
#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 (mx_get_magic (s) == M_IMAP)
imap_expand_path (s, slen);
#endif
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));