X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmx_imap.c;h=a851537b0ecef645d23aa7d039128cc2abc2e9cb;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hp=cf04c1979b5741d9588252b597ba13e223f848d2;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index cf04c19..a851537 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -9,14 +9,15 @@
 
 #include <sys/stat.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
 #include "mutt.h"
 #include "imap_private.h"
 
 #include "mx.h"
 #include "mx_imap.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
 
 #include "url.h"
 
@@ -42,7 +43,7 @@ static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
     mutt_perror (tmp);
     return (-1);
   }
-  msg->path = str_dup (tmp);
+  msg->path = m_strdup(tmp);
   return 0;
 }
 
@@ -61,7 +62,7 @@ static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 }
 
 mx_t* imap_reg_mx (void) {
-  mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;