projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, we don't need that. fix a regression in <esc>e
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
2bee349
..
a693fe6
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-24,6
+24,8
@@
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
@@
-31,10
+33,9
@@
#include "rfc1524.h"
#include "rfc3676.h"
#include "keymap.h"
#include "rfc1524.h"
#include "rfc3676.h"
#include "keymap.h"
-#include "mime.h"
#include "copy.h"
#include "charset.h"
#include "copy.h"
#include "charset.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "state.h"
#include "attach.h"
#include "lib.h"
#include "state.h"
#include "attach.h"
#include "lib.h"
@@
-967,11
+968,9
@@
int mutt_can_decode (BODY * a)
else if (a->type == TYPEMULTIPART) {
BODY *p;
else if (a->type == TYPEMULTIPART) {
BODY *p;
- if (WithCrypto) {
- if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
- ascii_strcasecmp (a->subtype, "encrypted") == 0)
- return (1);
- }
+ if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
+ ascii_strcasecmp (a->subtype, "encrypted") == 0)
+ return (1);
for (p = a->parts; p; p = p->next) {
if (mutt_can_decode (p))
for (p = a->parts; p; p = p->next) {
if (mutt_can_decode (p))
@@
-979,10
+978,10
@@
int mutt_can_decode (BODY * a)
}
}
}
}
- else if (
WithCrypto &&
a->type == TYPEAPPLICATION) {
- if (
(WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp
(a))
+ else if (a->type == TYPEAPPLICATION) {
+ if (
mutt_is_application_pgp
(a))
return (1);
return (1);
- if (
(WithCrypto & APPLICATION_SMIME) &&
mutt_is_application_smime (a))
+ if (mutt_is_application_smime (a))
return (1);
}
return (1);
}
@@
-1284,24
+1283,20
@@
void mutt_decode_attachment (BODY * b, STATE * s)
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
- mutt_decode_quoted (s, b->length, istext ||
- ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_quoted(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
case ENCBASE64:
break;
case ENCBASE64:
- mutt_decode_base64 (s, b->length, istext ||
- ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_base64(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
case ENCUUENCODED:
break;
case ENCUUENCODED:
- mutt_decode_uuencoded (s, b->length, istext
- || ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_uuencoded(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
default:
break;
default:
- mutt_decode_xbit (s, b->length, istext
- || ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_xbit(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
}
break;
}
@@
-1340,7
+1335,7
@@
int mutt_body_handler (BODY * b, STATE * s)
/* avoid copying this part twice since removing the transfer-encoding is
* the only operation needed.
*/
/* avoid copying this part twice since removing the transfer-encoding is
* the only operation needed.
*/
- if (
(WithCrypto & APPLICATION_PGP) &&
mutt_is_application_pgp (b))
+ if (mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
else
if (ascii_strcasecmp
handler = crypt_pgp_application_pgp_handler;
else
if (ascii_strcasecmp
@@
-1367,7
+1362,7
@@
int mutt_body_handler (BODY * b, STATE * s)
if (ascii_strcasecmp ("alternative", b->subtype) == 0)
handler = alternative_handler;
if (ascii_strcasecmp ("alternative", b->subtype) == 0)
handler = alternative_handler;
- else if (
WithCrypto &&
ascii_strcasecmp ("signed", b->subtype) == 0) {
+ else if (ascii_strcasecmp ("signed", b->subtype) == 0) {
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
@@
-1376,8
+1371,7
@@
int mutt_body_handler (BODY * b, STATE * s)
else if (s->flags & M_VERIFY)
handler = mutt_signed_handler;
}
else if (s->flags & M_VERIFY)
handler = mutt_signed_handler;
}
- else if ((WithCrypto & APPLICATION_PGP)
- && m_strcasecmp("encrypted", b->subtype) == 0) {
+ else if (m_strcasecmp("encrypted", b->subtype) == 0) {
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
@@
-1391,10
+1385,10
@@
int mutt_body_handler (BODY * b, STATE * s)
if (!handler)
handler = multipart_handler;
}
if (!handler)
handler = multipart_handler;
}
- else if (
WithCrypto &&
b->type == TYPEAPPLICATION) {
- if (
(WithCrypto & APPLICATION_PGP) &&
mutt_is_application_pgp (b))
+ else if (b->type == TYPEAPPLICATION) {
+ if (mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
handler = crypt_pgp_application_pgp_handler;
- if (
(WithCrypto & APPLICATION_SMIME) &&
mutt_is_application_smime (b))
+ if (mutt_is_application_smime (b))
handler = crypt_smime_application_smime_handler;
}
handler = crypt_smime_application_smime_handler;
}