factor out Context from mutt_save_message_ctx()

diff --git a/commands.c b/commands.c
index 9746ded7b2e42e4f7e44c54c91105e25349506e8..096fa4833a18879cdb3a0b1be6923e7b37d6f3a8 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -831,12 +831,12 @@ static void set_copy_flags(struct Email *e, bool decode, bool decrypt,
  * @param delete  If true, delete the original
  * @param decode  If true, decode the message
  * @param decrypt If true, decrypt the message
- * @param ctx     Mailbox to save to
+ * @param m       Mailbox to save to
  * @retval  0 Success
  * @retval -1 Error
  */
 int mutt_save_message_ctx(struct Email *e, bool delete, bool decode,
-                          bool decrypt, struct Context *ctx)
+                          bool decrypt, struct Mailbox *m)
 {
   int cmflags, chflags;
   int rc;
@@ -846,7 +846,7 @@ int mutt_save_message_ctx(struct Email *e, bool delete, bool decode,
   if (decode || decrypt)
     mutt_parse_mime_message(Context->mailbox, e);
 
-  rc = mutt_append_message(ctx->mailbox, Context->mailbox, e, cmflags, chflags);
+  rc = mutt_append_message(m, Context->mailbox, e, cmflags, chflags);
   if (rc != 0)
     return rc;
 
@@ -1004,7 +1004,7 @@ int mutt_save_message(struct Email *e, bool delete, bool decode, bool decrypt)
 #endif
     if (e)
     {
-      if (mutt_save_message_ctx(e, delete, decode, decrypt, savectx) != 0)
+      if (mutt_save_message_ctx(e, delete, decode, decrypt, savectx->mailbox) != 0)
       {
         mx_mbox_close(&savectx, NULL);
         return -1;
@@ -1038,7 +1038,7 @@ int mutt_save_message(struct Email *e, bool delete, bool decode, bool decrypt)
           continue;
 
         mutt_message_hook(Context, Context->mailbox->hdrs[i], MUTT_MESSAGE_HOOK);
-        rc = mutt_save_message_ctx(Context->mailbox->hdrs[i], delete, decode, decrypt, savectx);
+        rc = mutt_save_message_ctx(Context->mailbox->hdrs[i], delete, decode, decrypt, savectx->mailbox);
         if (rc != 0)
           break;
 #ifdef USE_COMPRESSED

diff --git a/commands.h b/commands.h
index e17e85cd7f73f5a9e8a7322b3524c61972b16e59..6d18b0969114cb88d0b46b59139ed2fad2522c0f 100644 (file)
--- a/commands.h
+++ b/commands.h
@@ -27,9 +27,9 @@
 #include <stdio.h>
 
 struct Body;
-struct Context;
-struct Envelope;
 struct Email;
+struct Envelope;
+struct Mailbox;
 
 /* These Config Variables are only used in commands.c */
 extern unsigned char CryptVerifySig; /* verify PGP signatures */
@@ -50,7 +50,7 @@ int  mutt_edit_content_type(struct Email *e, struct Body *b, FILE *fp);
 void mutt_enter_command(void);
 void mutt_pipe_message(struct Email *e);
 void mutt_print_message(struct Email *e);
-int  mutt_save_message_ctx(struct Email *e, bool delete, bool decode, bool decrypt, struct Context *ctx);
+int  mutt_save_message_ctx(struct Email *e, bool delete, bool decode, bool decrypt, struct Mailbox *m);
 int  mutt_save_message(struct Email *e, bool delete, bool decode, bool decrypt);
 int  mutt_select_sort(int reverse);
 void mutt_shell_escape(void);

diff --git a/imap/imap.c b/imap/imap.c
index 80d7d60fb148018e9524c3adaf5e448f8d36cdab..1231bd0081c49dedaea453a633e4dc2cfd79f8b2 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1750,7 +1750,7 @@ int imap_sync_mailbox(struct Context *ctx, bool expunge, bool close)
         mutt_message(ngettext("Saving changed message... [%d/%d]",
                               "Saving changed messages... [%d/%d]", m->msg_count),
                      i + 1, m->msg_count);
-        mutt_save_message_ctx(e, true, false, false, ctx);
+        mutt_save_message_ctx(e, true, false, false, ctx->mailbox);
         e->xlabel_changed = false;
       }
     }