X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=f3bb4f3ca3560769b0501fcdd37f61efc8c722a7;hp=2d3797b9d6c6b10e0c95d9bf9a4e35480213bc9a;hb=22601f25ede6703ba7cd06ee84eddd2045308570;hpb=9a1805afc94b21d8766e6e67ef57f92aaf966e84

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 2d3797b..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"
 
@@ -24,8 +26,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);
 }
@@ -35,16 +35,46 @@ static int acl_check_imap (CONTEXT* ctx, int bit) {
           mutt_bit_isset (((IMAP_DATA*) ctx->data)->rights, bit));
 }
 
+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) {
+    mutt_perror (tmp);
+    return (-1);
+  }
+  msg->path = m_strdup(tmp);
+  return 0;
+}
+
+/* this ugly kludge is required since the last int to
+ * imap_check_mailbox() doesn't mean 'lock' but 'force'... */
+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 = p_new(mx_t, 1);
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;
   fmt->mx_is_magic = imap_is_magic;
   fmt->mx_access = imap_access;
   fmt->mx_open_mailbox = imap_open_mailbox;
+  fmt->mx_open_new_message = imap_open_new_message;
   fmt->mx_acl_check = acl_check_imap;
   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);
 }