projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure fixes.
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
0087e3f
..
174d8e1
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-23,7
+23,6
@@
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
-#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-32,7
+31,6
@@
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
-#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
@@
-89,10
+87,7
@@
int mutt_num_postponed (int force)
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
- debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
}
}
- else
- debug_print (2, ("using old IMAP postponed count.\n"));
}
return PostCount;
}
}
return PostCount;
}
@@
-229,7
+224,7
@@
static HEADER *select_msg (void)
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
- size_t fcclen)
+ s
s
ize_t fcclen)
{
HEADER *h;
int code = SENDPOSTPONED;
{
HEADER *h;
int code = SENDPOSTPONED;
@@
-542,13
+537,13
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
mutt_error _("Decryption failed.");
return -1;
}
mutt_error _("Decryption failed.");
return -1;
}
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
newhdr->content = b;
mutt_clear_error ();
newhdr->content = b;
mutt_clear_error ();
@@
-561,15
+556,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
- if (ascii_strcasecmp (mutt_get_parameter
- ("protocol", newhdr->content->parameter),
- "application/pgp-signature") == 0)
+ if (ascii_strcasecmp(parameter_getval(newhdr->content->parameter, "protocol"),
+ "application/pgp-signature") == 0)
newhdr->security |= APPLICATION_PGP;
else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
newhdr->security |= APPLICATION_PGP;
else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
-
mutt_free_body
(&newhdr->content->parts->next);
+
body_list_wipe
(&newhdr->content->parts->next);
newhdr->content = mutt_remove_multipart (newhdr->content);
}
newhdr->content = mutt_remove_multipart (newhdr->content);
}
@@
-612,14
+606,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (b->type == TYPETEXT) {
if (!ascii_strcasecmp
if (b->type == TYPETEXT) {
if (!ascii_strcasecmp
- ("yes",
mutt_get_parameter ("x-mutt-noconv", b->parameter
)))
+ ("yes",
parameter_getval(b->parameter, "x-mutt-noconv"
)))
b->noconv = 1;
else {
s.flags |= M_CHARCONV;
b->noconv = 0;
}
b->noconv = 1;
else {
s.flags |= M_CHARCONV;
b->noconv = 0;
}
-
mutt_delete_parameter ("x-mutt-noconv", &b->parameter
);
+
parameter_delval(&b->parameter, "x-mutt-noconv"
);
}
mutt_adv_mktemp (NULL, file, sizeof (file));
}
mutt_adv_mktemp (NULL, file, sizeof (file));
@@
-635,7
+629,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
-
mutt_delete_parameter ("x-action", &b->parameter
);
+
parameter_delval(&b->parameter, "x-action"
);
}
else
mutt_decode_attachment (b, &s);
}
else
mutt_decode_attachment (b, &s);
@@
-648,7
+642,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
mutt_stamp_attachment (b);
mutt_stamp_attachment (b);
-
mutt_free_body
(&b->parts);
+
body_list_wipe
(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
@@
-680,7
+674,7
@@
bail:
if (rv == -1) {
envelope_delete(&newhdr->env);
if (rv == -1) {
envelope_delete(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
}
return rv;
}
return rv;