X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=b58a621eed1a23af81b091eeb1bc8354a2e4fcf3;hp=d13a00f7a7c15d9d4e8702f53b146e10af57d3a3;hb=9eb790d6eb4a56416d342816e1140aabd9c12de8;hpb=51239e43fd4a3c2440b4574379e8525d75646b3e

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index d13a00f..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,13 +70,13 @@ 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",
-            mlua_reggets(LTK_DOTLOCK),
-            flags & DL_FL_TRY ? "-t " : "",
-            flags & DL_FL_UNLOCK ? "-u " : "",
-            flags & DL_FL_USEPRIV ? "-p " : "",
-            flags & DL_FL_FORCE ? "-f " : "",
-            flags & DL_FL_UNLINK ? "-d " : "",
-            flags & DL_FL_RETRY ? r : "", f);
+           MCore.dotlock,
+           flags & DL_FL_TRY ? "-t " : "",
+           flags & DL_FL_UNLOCK ? "-u " : "",
+           flags & DL_FL_USEPRIV ? "-p " : "",
+           flags & DL_FL_FORCE ? "-f " : "",
+           flags & DL_FL_UNLINK ? "-d " : "",
+           flags & DL_FL_RETRY ? r : "", f);
 
   return mutt_system (cmd);
 }
@@ -552,9 +552,9 @@ void mx_fastclose_mailbox (CONTEXT * ctx)
   if (MX_IDX(ctx->magic-1) && mxfmts[ctx->magic-1]->mx_fastclose_mailbox)
     mxfmts[ctx->magic-1]->mx_fastclose_mailbox(ctx);
   if (ctx->subj_hash)
-    hash_destroy (&ctx->subj_hash, NULL);
+    hash_delete (&ctx->subj_hash, NULL);
   if (ctx->id_hash)
-    hash_destroy (&ctx->id_hash, NULL);
+    hash_delete (&ctx->id_hash, NULL);
   mutt_clear_threads (ctx);
   for (i = 0; i < ctx->msgcount; i++)
     header_delete(&ctx->hdrs[i]);
@@ -906,10 +906,10 @@ void mx_update_tables (CONTEXT * ctx, int committing)
                       ctx->hdrs[i]->content->hdr_offset);
       /* remove message from the hash tables */
       if (ctx->subj_hash && ctx->hdrs[i]->env->real_subj)
-        hash_delete (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
+        hash_remove (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
                      ctx->hdrs[i], NULL);
       if (ctx->id_hash && ctx->hdrs[i]->env->message_id)
-        hash_delete (ctx->id_hash, ctx->hdrs[i]->env->message_id,
+        hash_remove (ctx->id_hash, ctx->hdrs[i]->env->message_id,
                      ctx->hdrs[i], NULL);
       header_delete(&ctx->hdrs[i]);
     }
@@ -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));
     }
   }