X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=f3bb4f3ca3560769b0501fcdd37f61efc8c722a7;hp=26ee4769951cd20e02a0ef2a12c2c4dcc60fe631;hb=238b70e39b78f585c586bd51aef41988b3cc73d1;hpb=42cc85de46ed8971a6c793835023cf26766fb096

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 26ee476..f3bb4f3 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -9,14 +9,16 @@
 
 #include <sys/stat.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/file.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"
 
@@ -38,9 +40,11 @@ static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
   char tmp[_POSIX_PATH_MAX];
 
   mutt_mktemp (tmp);
-  if ((msg->fp = safe_fopen (tmp, "w")) == NULL)
+  if ((msg->fp = safe_fopen (tmp, "w")) == NULL) {
+    mutt_perror (tmp);
     return (-1);
-  msg->path = safe_strdup (tmp);
+  }
+  msg->path = m_strdup(tmp);
   return 0;
 }
 
@@ -59,7 +63,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;