X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmessage.c;h=1871be3b79d1160b02538e53910f4534b74ca168;hb=f435868132e200bfa71ac155f037cf64bf5414ba;hp=df604d72225ac9554edc8ba3d2126b55204a6606;hpb=eab38ff6950a0075741f24ac9fb0d9eaf7df8671;p=apps%2Fmadmutt.git

diff --git a/imap/message.c b/imap/message.c
index df604d7..1871be3 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -12,7 +12,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 #include <lib-mx/hcache.h>
 
@@ -79,7 +79,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(MCore.tmpdir), NULL);
+  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!fp) {
     mutt_error(_("Could not create temporary file"));
     mutt_sleep(2);
@@ -96,7 +96,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   idata->newMailCount = 0;
 
 #ifdef USE_HCACHE
-  if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) {
+  if ((hc = mutt_hcache_open(ctx->path))) {
 
     snprintf (buf, sizeof (buf),
               "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
@@ -371,7 +371,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(MCore.tmpdir), NULL);
+  msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
   if (!msg->fp) {
     return -1;
   }
@@ -384,7 +384,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   snprintf (buf, sizeof (buf), "UID FETCH %u %s", HEADER_DATA (h)->uid,
             (mutt_bit_isset (idata->capabilities, IMAP4REV1) ?
-             (option (OPTIMAPPEEK) ? "BODY.PEEK[]" : "BODY[]") : "RFC822"));
+             "BODY.PEEK[]" : "RFC822"));
 
   imap_cmd_start (idata, buf);
   do {