X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=b58a621eed1a23af81b091eeb1bc8354a2e4fcf3;hp=90a46f4b0742a31969c89f81e6950d61130c64be;hb=fd97b7b962d97d99e98cd566a34fcdaaeb950bfd;hpb=b1c9f537b475b3bc8f6517bb4d7008a411bb478e

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 90a46f4..b58a621 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -16,9 +16,9 @@
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/sidebar.h>
-#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
+#include "crypt.h"
 #include "pattern.h"
 #include "buffy.h"
 #include "mx.h"
@@ -70,7 +70,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",
-           ml_core.dotlock,
+           MCore.dotlock,
            flags & DL_FL_TRY ? "-t " : "",
            flags & DL_FL_UNLOCK ? "-u " : "",
            flags & DL_FL_USEPRIV ? "-p " : "",
@@ -1080,7 +1080,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 (Username),
+      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(MCore.username),
                ctime (&msg->received));
     }
   }