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

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 05c9e8a..5f4b8dd 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,11 +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
@@ -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 " : "",
@@ -272,24 +269,6 @@ int mx_unlock_file (const char *path, int fd, int dot)
     return 0;
 }
 
-static void mx_unlink_empty (const char *path)
-{
-    int fd;
-
-    if ((fd = open (path, O_RDWR)) == -1)
-        return;
-
-    if (mx_lock_file (path, fd, 1, 0, 1) == -1) {
-    close (fd);
-    return;
-  }
-
-  invoke_dotlock(path, DL_FL_UNLINK, 1);
-
-  mx_unlock_file (path, fd, 0);
-  close (fd);
-}
-
 /* try to figure out what type of mailbox ``path'' is */
 int mx_get_magic (const char *path) {
   int i = 0;
@@ -816,12 +795,6 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
     mutt_message (_("%d kept, %d deleted."),
                   ctx->msgcount - ctx->deleted, ctx->deleted);
 
-  if (ctx->msgcount == ctx->deleted && ctx->magic == M_MBOX
-  &&  !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY))
-  {
-    mx_unlink_empty (ctx->path);
-  }
-
   if (ctx->cinfo && mutt_slow_close_compressed (ctx))
     return (-1);
 
@@ -995,20 +968,11 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint)
   if (rc == 0) {
     if (ctx->magic == M_IMAP && !purge)
       mutt_message (_("Mailbox checkpointed."));
-
     else
       mutt_message (_("%d kept, %d deleted."), msgcount - deleted, deleted);
 
     mutt_sleep (0);
 
-    if (ctx->msgcount == ctx->deleted && ctx->magic == M_MBOX
-    &&  !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY))
-    {
-      unlink (ctx->path);
-      mx_fastclose_mailbox (ctx);
-      return 0;
-    }
-
     /* if we haven't deleted any messages, we don't need to resort */
     /* ... except for certain folder formats which need "unsorted" 
      * sort order in order to synchronize folders.
@@ -1074,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));
     }
   }
@@ -1198,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);
@@ -1239,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);
       }
     }
@@ -1251,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);
     }