we don't really need md5 for hcache at all.

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

diff --git a/imap/message.c b/imap/message.c
index bbd7f7b..d780c9c 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -54,10 +54,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   int rc, mfhrc, oldmsgcount;
   int fetchlast = 0;
   const char *want_headers =
-    "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES string_list_t-POST X-LABEL";
+    "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL";
 
 #ifdef USE_HCACHE
-  void *hc = NULL;
+  hcache_t *hc = NULL;
   unsigned long *uid_validity = NULL;
   char uid_buf[64];
 #endif /* USE_HCACHE */
@@ -83,7 +83,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
   /* instead of downloading all headers and then parsing them, we parse them
    * as they come in. */
-  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
   if (!fp) {
     mutt_error(_("Could not create temporary file"));
     mutt_sleep(2);
@@ -164,7 +164,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
       if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
         imap_free_header_data((void *)&h.data);
         m_fclose(&fp);
-        mutt_hcache_close (hc);
+        mutt_hcache_close (&hc);
         return -1;
       }
     }
@@ -264,7 +264,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
       imap_free_header_data ((void *)&h.data);
       m_fclose(&fp);
 #ifdef USE_HCACHE
-      mutt_hcache_close (hc);
+      mutt_hcache_close (&hc);
 #endif /* USE_HCACHE */
       return -1;
     }
@@ -280,7 +280,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   }
 
 #ifdef USE_HCACHE
-  mutt_hcache_close (hc);
+  mutt_hcache_close (&hc);
 #endif /* USE_HCACHE */
 
   m_fclose(&fp);
@@ -376,7 +376,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     mutt_message _("Fetching message...");
 
   cache->uid = HEADER_DATA (h)->uid;
-  msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+  msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
   if (!msg->fp) {
     return -1;
   }