X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.c;h=058fe1de61ef2bf6f366aa093d780cff95bce220;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hp=465a770f609e84c62421abafd48ac13dded42ca2;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/pop/pop.c b/pop/pop.c
index 465a770..058fe1d 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -12,6 +12,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -19,8 +21,6 @@
 #include "mutt_crypt.h"
 #include "mutt_curses.h"
 
-#include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -142,7 +142,7 @@ static int fetch_uidl (char *line, void *data)
 
     ctx->msgcount++;
     ctx->hdrs[i] = mutt_new_header ();
-    ctx->hdrs[i]->data = str_dup (line);
+    ctx->hdrs[i]->data = m_strdup(line);
   }
   else if (ctx->hdrs[i]->index != index - 1)
     pop_data->clear_cache = 1;
@@ -248,7 +248,7 @@ int pop_open_mailbox (CONTEXT * ctx)
     return -1;
 
   p_delete(&ctx->path);
-  ctx->path = str_dup (buf);
+  ctx->path = m_strdup(buf);
 
   pop_data = p_new(POP_DATA, 1);
   pop_data->conn = conn;
@@ -405,7 +405,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
    * portion of the headers, those required for the main display.
    */
   cache->index = h->index;
-  cache->path = str_dup (path);
+  cache->path = m_strdup(path);
   rewind (msg->fp);
   uidl = h->data;
   mutt_free_envelope (&h->env);