#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"
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);
}
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]);
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]);
}
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));
}
}