rework compress_info type a bit.

[apps/madmutt.git] / mx.c

diff --git a/mx.c b/mx.c
index 88537ab..3d10313 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -29,14 +29,10 @@
 #include "dotlock.h"
 
 #include <imap/imap.h>
-#include <imap/mx_imap.h>
-
 #include <pop/pop.h>
-#include <pop/mx_pop.h>
 
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
-#include "nntp/mx_nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #include <lib-crypt/crypt.h>
@@ -280,7 +276,6 @@ int mx_unlock_file (const char *path, int fd, int dot)
 static void mx_unlink_empty (const char *path)
 {
   int fd;
-  struct stat sb;
 
   if ((fd = open (path, O_RDWR)) == -1)
     return;
@@ -566,7 +561,7 @@ void mx_fastclose_mailbox (CONTEXT * ctx)
   p_delete(&ctx->hdrs);
   p_delete(&ctx->v2r);
 
-  if (ctx->compressinfo)
+  if (ctx->cinfo)
     mutt_fast_close_compressed (ctx);
 
   p_delete(&ctx->path);
@@ -589,7 +584,7 @@ static int sync_mailbox (CONTEXT * ctx, int *index_hint)
     /* the 1 is only of interest for IMAP and means EXPUNGE */
     rc = mxfmts[ctx->magic-1]->mx_sync_mailbox(ctx,1,index_hint);
 
-  if (rc == 0 && ctx->compressinfo)
+  if (rc == 0 && ctx->cinfo)
     return mutt_sync_compressed (ctx);
 
   return rc;
@@ -831,7 +826,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
       !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY))
     mx_unlink_empty (ctx->path);
 
-  if (ctx->compressinfo && mutt_slow_close_compressed (ctx))
+  if (ctx->cinfo && mutt_slow_close_compressed (ctx))
     return (-1);
 
   mx_fastclose_mailbox (ctx);
@@ -1098,7 +1093,7 @@ MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
 
 /* check for new mail */
 int mx_check_mailbox (CONTEXT * ctx, int *index_hint, int lock) {
-  if (ctx->compressinfo)
+  if (ctx->cinfo)
     return mutt_check_mailbox_compressed (ctx);
 
   if (ctx) {