code simplifications.

[apps/madmutt.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index d780c9c..cc339b7 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -20,10 +20,6 @@
 #include "imap_private.h"
 #include "message.h"
 
-#ifdef HAVE_PGP
-#include "pgp.h"
-#endif
-
 static void flush_buffer (char *buf, size_t * len, CONNECTION * conn);
 static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
                              FILE * fp);
@@ -58,7 +54,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
 #ifdef USE_HCACHE
   hcache_t *hc = NULL;
-  unsigned long *uid_validity = NULL;
+  long *uid_validity = NULL;
   char uid_buf[64];
 #endif /* USE_HCACHE */
 
@@ -132,11 +128,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
         fputs ("\n\n", fp);
 
         sprintf (uid_buf, "/%u", h.data->uid);    /* XXX --tg 21:41 04-07-11 */
-        uid_validity =
-          (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
+        uid_validity = mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
 
         if (uid_validity != NULL && *uid_validity == idata->uid_validity) {
-          ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
+          ctx->hdrs[msgno] = mutt_hcache_restore(uid_validity, 0);
           ctx->hdrs[msgno]->index = h.sid - 1;
           /* messages which have not been expunged are ACTIVE (borrowed from mh 
           * folders) */