#include "version.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#include "imap/mx_imap.h"
-#endif
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "lib/debug.h"
#ifdef MIXMASTER
mutt_free_list (&(*h)->chain);
#endif
-#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
p_delete(&(*h)->data);
-#endif
p_delete(h);
}
case '=':
case '+':
{
-#ifdef USE_IMAP
/* if folder = imap[s]://host/: don't append slash */
if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
Maildir[m_strlen(Maildir) - 1] == '/')
m_strcpy(p, sizeof(p), NONULL(Maildir));
else
-#endif
snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
tail = s + 1;
break;
case TYPEAPPLICATION:
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (m))
+ if (mutt_is_application_pgp (m))
return 0;
- if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (m))
+ if (mutt_is_application_smime (m))
return 0;
break;
int t = b->type;
char *s = b->subtype;
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ if (mutt_is_application_pgp (b))
return 0;
if (t == TYPETEXT)
return 1;
}
- if ((WithCrypto & APPLICATION_PGP) && t == TYPEAPPLICATION) {
+ if (t == TYPEAPPLICATION) {
if (!ascii_strcasecmp ("pgp-keys", s))
return 1;
}
scheme = url_check_scheme (s);
-#ifdef USE_IMAP
if (scheme == U_IMAP || scheme == U_IMAPS) {
imap_pretty_mailbox (s);
return;
}
-#endif
/* if s is an url, only collapse path component */
if (scheme != U_UNKNOWN) {
magic = mx_get_magic (s);
-#ifdef USE_POP
if (magic == M_POP) {
mutt_error _("Can't save message to POP mailbox.");
return 1;
}
-#endif
#ifdef USE_NNTP
if (magic == M_NNTP) {
}
}
else {
-#ifdef USE_IMAP
if (magic != M_IMAP)
-#endif /* execute the block unconditionally if we don't use imap */
{
st->st_mtime = 0;
st->st_atime = 0;