X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=5f4b8ddf93f8583a13a69d34991e1acd4e06726a;hp=aa7e3e372f52a807301f9be1e4375da32d608ed9;hb=8db3fe9c19320b6f6e508d6b1aae03980239a930;hpb=55de28a5bb96c3edfbb2a3b080356acbb44a3cc4

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index aa7e3e3..5f4b8dd 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -26,10 +26,11 @@
 #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>
 #endif
@@ -65,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 " : "",
@@ -1037,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));
     }
   }
@@ -1202,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);
       }
     }
@@ -1214,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);
     }