projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generalize the idea of tokens a bit more, don't restrict it to the rfc822
[apps/madmutt.git]
/
headers.c
diff --git
a/headers.c
b/headers.c
index
a9be3cd
..
e4709ac
100644
(file)
--- a/
headers.c
+++ b/
headers.c
@@
-16,7
+16,7
@@
#include <lib-lib/file.h>
#include "mutt.h"
#include <lib-lib/file.h>
#include "mutt.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "lib/debug.h"
#include "mutt_idna.h"
#include "lib/debug.h"
@@
-103,7
+103,7
@@
void mutt_edit_headers (const char *editor,
n->references = msg->env->references;
msg->env->references = NULL;
n->references = msg->env->references;
msg->env->references = NULL;
-
mutt_free_envelope
(&msg->env);
+
envelope_delete
(&msg->env);
msg->env = n;
n = NULL;
msg->env = n;
n = NULL;
@@
-137,7
+137,7
@@
void mutt_edit_headers (const char *editor,
keep = 0;
}
else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
keep = 0;
}
else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
- BODY *body;
+ BODY *b
b
ody;
BODY *parts;
char *q;
BODY *parts;
char *q;
@@
-150,10
+150,10
@@
void mutt_edit_headers (const char *editor,
else
m_strcpy(path, sizeof(path), p);
mutt_expand_path (path, sizeof (path));
else
m_strcpy(path, sizeof(path), p);
mutt_expand_path (path, sizeof (path));
- if ((body = mutt_make_file_attach (path))) {
- body->description = m_strdup(q);
+ if ((b
b
ody = mutt_make_file_attach (path))) {
+ b
b
ody->description = m_strdup(q);
for (parts = msg->content; parts->next; parts = parts->next);
for (parts = msg->content; parts->next; parts = parts->next);
- parts->next = body;
+ parts->next = b
b
ody;
}
else {
mutt_pretty_mailbox (path);
}
else {
mutt_pretty_mailbox (path);
@@
-164,8
+164,7
@@
void mutt_edit_headers (const char *editor,
}
}
- else if ((WithCrypto & APPLICATION_PGP)
- && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+ else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
if (msg->security)
msg->security |= APPLICATION_PGP;
msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
if (msg->security)
msg->security |= APPLICATION_PGP;