projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ESMTP is utterly broken, and pulls OpenSSL.
[apps/madmutt.git]
/
lib-mx
/
mx.c
diff --git
a/lib-mx/mx.c
b/lib-mx/mx.c
index
6a64115
..
5f4b8dd
100644
(file)
--- a/
lib-mx/mx.c
+++ b/
lib-mx/mx.c
@@
-10,8
+10,6
@@
#include <lib-lib/lib-lib.h>
#include <lib-lib/lib-lib.h>
-#include <utime.h>
-
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
@@
-20,7
+18,6
@@
#include "mutt.h"
#include "crypt.h"
#include "pattern.h"
#include "mutt.h"
#include "crypt.h"
#include "pattern.h"
-#include "buffy.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
@@
-29,11
+26,11
@@
#include "copy.h"
#include "keymap.h"
#include "compress.h"
#include "copy.h"
#include "keymap.h"
#include "compress.h"
+#include "score.h"
#include "dotlock.h"
#include <imap/imap.h>
#include "dotlock.h"
#include <imap/imap.h>
-#include <pop/pop.h>
-
+#include "pop.h"
#ifdef USE_NNTP
#include <nntp/nntp.h>
#endif
#ifdef USE_NNTP
#include <nntp/nntp.h>
#endif
@@
-69,7
+66,7
@@
static int invoke_dotlock (const char *path, int flags, int retry)
mutt_quote_filename (f, sizeof (f), path);
snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s",
mutt_quote_filename (f, sizeof (f), path);
snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s",
-
MC
ore.dotlock,
+
mod_c
ore.dotlock,
flags & DL_FL_TRY ? "-t " : "",
flags & DL_FL_UNLOCK ? "-u " : "",
flags & DL_FL_USEPRIV ? "-p " : "",
flags & DL_FL_TRY ? "-t " : "",
flags & DL_FL_UNLOCK ? "-u " : "",
flags & DL_FL_USEPRIV ? "-p " : "",
@@
-1041,7
+1038,7
@@
MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
p = hdr->env->from;
}
p = hdr->env->from;
}
- fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(
MC
ore.username),
+ fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(
mod_c
ore.username),
ctime (&msg->received));
}
}
ctime (&msg->received));
}
}
@@
-1165,7
+1162,7
@@
int mx_close_message (MESSAGE ** msg)
void mx_alloc_memory (CONTEXT * ctx)
{
void mx_alloc_memory (CONTEXT * ctx)
{
- ctx->hdrmax +=
25
;
+ ctx->hdrmax +=
32
;
p_realloc(&ctx->hdrs, ctx->hdrmax);
p_realloc(&ctx->v2r, ctx->hdrmax);
p_realloc(&ctx->hdrs, ctx->hdrmax);
p_realloc(&ctx->v2r, ctx->hdrmax);
@@
-1206,7
+1203,7
@@
void mx_update_context (CONTEXT * ctx, int new_messages)
/* p_delete(&h->env->supersedes); should I ? */
if (h2) {
h2->superseded = 1;
/* p_delete(&h->env->supersedes); should I ? */
if (h2) {
h2->superseded = 1;
- if (!ctx->counting &&
option (OPTSCORE)
)
+ if (!ctx->counting &&
mod_score.enable
)
mutt_score_message (ctx, h2, 1);
}
}
mutt_score_message (ctx, h2, 1);
}
}
@@
-1218,7
+1215,7
@@
void mx_update_context (CONTEXT * ctx, int new_messages)
if (ctx->subj_hash && h->env->real_subj)
hash_insert (ctx->subj_hash, h->env->real_subj, h);
if (ctx->subj_hash && h->env->real_subj)
hash_insert (ctx->subj_hash, h->env->real_subj, h);
- if (
option (OPTSCORE)
)
+ if (
mod_score.enable
)
mutt_score_message (ctx, h, 0);
}
mutt_score_message (ctx, h, 0);
}