projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more simplifcations
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
afcc9b1
..
0d97216
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-29,11
+29,10
@@
#include "sort.h"
#include "thread.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#include "imap/mx_imap.h"
-#endif
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
+
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
#include "lib/debug.h"
#include "lib/debug.h"
@@
-82,7
+81,6
@@
int mutt_num_postponed (int force)
if (!Postponed)
return 0;
if (!Postponed)
return 0;
-#ifdef USE_IMAP
/* LastModify is useless for IMAP */
if (imap_is_magic (Postponed, NULL) == M_IMAP) {
if (force) {
/* LastModify is useless for IMAP */
if (imap_is_magic (Postponed, NULL) == M_IMAP) {
if (force) {
@@
-98,7
+96,6
@@
int mutt_num_postponed (int force)
}
return PostCount;
}
}
return PostCount;
}
-#endif
if (stat (Postponed, &st) == -1) {
PostCount = 0;
if (stat (Postponed, &st) == -1) {
PostCount = 0;
@@
-150,7
+147,7
@@
void mutt_update_num_postponed (void)
UpdateNumPostponed = 1;
}
UpdateNumPostponed = 1;
}
-static void post_entry (char *s, size_t slen, MUTTMENU * menu, int entry)
+static void post_entry (char *s, s
s
ize_t slen, MUTTMENU * menu, int entry)
{
CONTEXT *ctx = (CONTEXT *) menu->data;
{
CONTEXT *ctx = (CONTEXT *) menu->data;
@@
-544,7
+541,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
|| b == NULL) {
err:
mx_close_message (&msg);
|| b == NULL) {
err:
mx_close_message (&msg);
-
mutt_free_envelope
(&newhdr->env);
+
envelope_delete
(&newhdr->env);
mutt_free_body (&newhdr->content);
mutt_error _("Decryption failed.");
mutt_free_body (&newhdr->content);
mutt_error _("Decryption failed.");
@@
-682,7
+679,7
@@
bail:
mx_close_message (&msg);
if (rv == -1) {
mx_close_message (&msg);
if (rv == -1) {
-
mutt_free_envelope
(&newhdr->env);
+
envelope_delete
(&newhdr->env);
mutt_free_body (&newhdr->content);
}
mutt_free_body (&newhdr->content);
}