X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.c;h=572c79e4463a9e1891b7e6d92b515412d9bce6e7;hb=334faeb80904ba5b8ced869abfea2731440d52e5;hp=73936d1172b4aaba7f37854775baeba2942e42a9;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1;p=apps%2Fmadmutt.git

diff --git a/pop/pop.c b/pop/pop.c
index 73936d1..572c79e 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -11,21 +11,21 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <unistd.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/file.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "mx.h"
 #include "pop.h"
-#include "mutt_crypt.h"
-#include "mutt_curses.h"
-
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
+#include <lib-crypt/crypt.h>
 
 /* write line to file */
 static int fetch_message (char *line, void *file)
@@ -142,7 +142,7 @@ static int fetch_uidl (char *line, void *data)
       mx_alloc_memory (ctx);
 
     ctx->msgcount++;
-    ctx->hdrs[i] = mutt_new_header ();
+    ctx->hdrs[i] = header_new();
     ctx->hdrs[i]->data = m_strdup(line);
   }
   else if (ctx->hdrs[i]->index != index - 1)
@@ -217,7 +217,7 @@ static int pop_fetch_headers (CONTEXT * ctx)
 
   if (ret != PQ_OK) {
     for (i = ctx->msgcount; i < new_count; i++)
-      mutt_free_header (&ctx->hdrs[i]);
+      header_delete(&ctx->hdrs[i]);
     return ret;
   }
 
@@ -409,7 +409,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   cache->path = m_strdup(path);
   rewind (msg->fp);
   uidl = h->data;
-  mutt_free_envelope (&h->env);
+  envelope_delete(&h->env);
   h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
   h->data = uidl;
   h->lines = 0;