X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=b479dc2d5cd47c6310be7f39c96566d41becae52;hp=140df180c6b746ebeed019b631cd272dfd6c532e;hb=daf6df95bfcc7efc888b488a825e467268f20d3c;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/hcache.c b/hcache.c
index 140df18..b479dc2 100644
--- a/hcache.c
+++ b/hcache.c
@@ -46,9 +46,7 @@
 #include <lib-mime/mime.h>
 
 #include "mutt.h"
-#ifdef USE_IMAP
-#include "message.h"
-#endif
+#include <imap/message.h>
 #include "mx.h"
 #include "lib.h"
 
@@ -456,31 +454,22 @@ static int generate_crc32 ()
                (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
 
 #if HAVE_LANGINFO_CODESET
-  crc = crc32 (crc, (unsigned char const *) Charset, m_strlen(Charset));
-  crc =
-    crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-           m_strlen("HAVE_LANGINFO_CODESET"));
+  crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
+  crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
+              m_strlen("HAVE_LANGINFO_CODESET"));
 #endif
 
-#ifdef USE_POP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
 
 #ifdef MIXMASTER
-  crc =
-    crc32 (crc, (unsigned char const *) "MIXMASTER",
-           m_strlen("MIXMASTER"));
+  crc = crc32(crc, (unsigned char const *) "MIXMASTER",
+              m_strlen("MIXMASTER"));
 #endif
 
-#ifdef USE_IMAP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
 
 #ifdef USE_NNTP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
+  crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
 #endif
   return crc;
 }
@@ -576,7 +565,7 @@ static void *mutt_hcache_dump (void *_db, HEADER * h, int *off,
 HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
 {
   int off = 0;
-  HEADER *h = mutt_new_header ();
+  HEADER *h = header_new();
 
   /* skip validate */
   off += sizeof (validate);
@@ -587,7 +576,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   memcpy (h, d + off, sizeof (HEADER));
   off += sizeof (HEADER);
 
-  h->env = mutt_new_envelope ();
+  h->env = envelope_new();
   restore_envelope (h->env, d, &off);
 
   h->content = mutt_new_body ();
@@ -599,7 +588,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   if (oh) {
     h->old = (*oh)->old;
     h->path = m_strdup((*oh)->path);
-    mutt_free_header (oh);
+    header_delete(oh);
   }
 
   return h;