X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=72f1349f92459fbd4a4ea47f99bbb0ebbbad147a;hp=6a6411521955528f5385a35a0967b94976027c21;hb=f435868132e200bfa71ac155f037cf64bf5414ba;hpb=2ac2bb6e436cef59dcbb88031b276aa81a109785

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 6a64115..72f1349 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -10,8 +10,6 @@
 
 #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>
@@ -20,7 +18,6 @@
 #include "mutt.h"
 #include "crypt.h"
 #include "pattern.h"
-#include "buffy.h"
 #include "mx.h"
 #include "mbox.h"
 #include "mh.h"
@@ -29,13 +26,13 @@
 #include "copy.h"
 #include "keymap.h"
 #include "compress.h"
+#include "score.h"
 #include "dotlock.h"
 
 #include <imap/imap.h>
-#include <pop/pop.h>
-
+#include "pop.h"
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
 #endif
 
 static mx_t const *mxfmts[] = {
@@ -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",
-           MCore.dotlock,
+           mod_core.dotlock,
            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;
       }
 
-      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(MCore.username),
+      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(mod_core.username),
                ctime (&msg->received));
     }
   }
@@ -1165,7 +1162,7 @@ int mx_close_message (MESSAGE ** msg)
 
 void mx_alloc_memory (CONTEXT * ctx)
 {
-    ctx->hdrmax += 25;
+    ctx->hdrmax += 32;
 
     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;
-        if (!ctx->counting && option (OPTSCORE))
+        if (!ctx->counting && mod_score.enable)
           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 (option (OPTSCORE))
+      if (mod_score.enable)
         mutt_score_message (ctx, h, 0);
     }