X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=e54fd04296ba3120123397e72c4d34f04d161acd;hp=609b04770e2469670f8cd087344a726d467783ea;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=19806c1ee3019ddf9facf23eb19a13c128abfba9

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 609b047..e54fd04 100644
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -35,7 +35,6 @@
 
 #define MAXLOCKATTEMPT 5
 
-
 static mx_t const *mxfmts[] = {
     &mbox_mx,
     &mh_mx,
@@ -43,6 +42,11 @@ static mx_t const *mxfmts[] = {
     &imap_mx,
     &pop_mx,
     &compress_mx,
+
+#if 0
+    /* hack so that it's linked together */
+    &pop_mx_ng,
+#endif
 };
 
 #define MX_IDX(idx)          (idx >= 0 && idx < countof(mxfmts))
@@ -517,7 +521,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint)
     /* try to use server-side copy first */
     i = 1;
 
-    if (ctx->magic == M_IMAP && imap_is_magic (mbox, NULL) == M_IMAP) {
+    if (ctx->magic == M_IMAP && imap_mx.mx_is_magic (mbox, NULL) == M_IMAP) {
       /* tag messages for moving, and clear old tags, if any */
       for (i = 0; i < ctx->msgcount; i++)
         if (ctx->hdrs[i]->read && !ctx->hdrs[i]->deleted
@@ -817,6 +821,7 @@ int mx_sync_mailbox (CONTEXT* ctx, int* index_hint) {
  */
 MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
 {
+
   MESSAGE *msg;
   address_t *p = NULL;
 
@@ -877,52 +882,16 @@ int mx_check_mailbox (CONTEXT * ctx, int *index_hint, int lock) {
 /* return a stream pointer for a message */
 MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
 {
-  MESSAGE *msg;
-
-  msg = p_new(MESSAGE, 1);
-  switch (msg->magic = ctx->magic) {
-  case M_MBOX:
-    msg->fp = ctx->fp;
-    break;
+    MESSAGE *msg;
 
-  case M_MH:
-  case M_MAILDIR:
-    {
-      HEADER *cur = ctx->hdrs[msgno];
-      char path[_POSIX_PATH_MAX];
-
-      snprintf (path, sizeof (path), "%s/%s", ctx->path, cur->path);
-
-      if ((msg->fp = fopen (path, "r")) == NULL && errno == ENOENT &&
-          ctx->magic == M_MAILDIR)
-        msg->fp = maildir_open_find_message (ctx->path, cur->path);
+    if (!MX_IDX(ctx->magic) || !mxfmts[ctx->magic - 1]->mx_open_message)
+        return NULL;
 
-      if (msg->fp == NULL) {
-        mutt_perror (path);
+    msg = p_new(MESSAGE, 1);
+    msg->magic = ctx->magic;
+    if (mxfmts[ctx->magic - 1]->mx_open_message(msg, ctx, msgno))
         p_delete(&msg);
-      }
-    }
-    break;
-
-  case M_IMAP:
-    {
-      if (imap_fetch_message (msg, ctx, msgno) != 0)
-        p_delete(&msg);
-      break;
-    }
-
-  case M_POP:
-    {
-      if (pop_fetch_message (msg, ctx, msgno) != 0)
-        p_delete(&msg);
-      break;
-    }
-
-  default:
-    p_delete(&msg);
-    break;
-  }
-  return msg;
+    return msg;
 }
 
 /* commit a message to a folder */