X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=6ad4b324590ba594615532c5e8133859c23d7897;hp=b44f9e1d83cdbc40e239524a13aaae9bec268090;hb=ea912b20ba2b3b9dfdbbae758ad56263c9aa41b3;hpb=baf86ef44a449017ea20c3fcb252b66dc43fe6ce

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index b44f9e1..6ad4b32 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -24,8 +24,6 @@ int imap_is_magic (const char* path, struct stat* st) {
   url_scheme_t s;
   if (!path || !*path)
     return (-1);
-  if (*path == '{')     /* painpine compatibility */
-    return (M_IMAP);
   s = url_check_scheme (NONULL (path));
   return ((s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1);
 }
@@ -40,9 +38,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 = str_dup (tmp);
   return 0;
 }
 
@@ -52,8 +52,16 @@ static int _imap_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
   return (imap_check_mailbox (ctx, index_hint, 0));
 }
 
+static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
+  int r = 0;
+
+  if ((r = safe_fclose (&msg->fp)) == 0)
+    r = imap_append_message (ctx, msg);
+  return (r);
+}
+
 mx_t* imap_reg_mx (void) {
-  mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;
@@ -65,5 +73,6 @@ mx_t* imap_reg_mx (void) {
   fmt->mx_fastclose_mailbox = imap_close_mailbox;
   fmt->mx_sync_mailbox = imap_sync_mailbox;
   fmt->mx_check_mailbox = _imap_check_mailbox;
+  fmt->mx_commit_message = imap_commit_message;
   return (fmt);
 }