lib-storage: Moved mailbox.save_is_attachment() to mail_save_context.part_is_attachment()

diff --git a/src/lib-storage/index/cydir/cydir-storage.c b/src/lib-storage/index/cydir/cydir-storage.c
index c5bac64f93bd8808a4cc5a37800a1cc496119275..0d20696013292f9a00ce60e855a9d65b700a1159 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-storage.c
+++ b/src/lib-storage/index/cydir/cydir-storage.c
@@ -167,7 +167,6 @@ struct mailbox cydir_mailbox = {
                cydir_save_finish,
                cydir_save_cancel,
                mail_storage_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index 9d19e2880721b82309a474c5a59e8950f1c9bdfc..577b9b45344f30ce619d9ebd9b685fca1374408c 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -426,7 +426,6 @@ struct mailbox mdbox_mailbox = {
                mdbox_save_finish,
                mdbox_save_cancel,
                mdbox_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 4cc3ea0ebf2e458a368ae4f695b867d892a8d341..aaf0fdff7bd4d950839ab309caba555555ea56b3 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -393,7 +393,6 @@ struct mailbox sdbox_mailbox = {
                sdbox_save_finish,
                sdbox_save_cancel,
                sdbox_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/index/index-attachment.c b/src/lib-storage/index/index-attachment.c
index 0c6cbbd5227d8ac43de4a48b4dfdb71fa166d3d4..8eb3d7fc31487e0c11f5273ead0f27698d197d88 100644 (file)
--- a/src/lib-storage/index/index-attachment.c
+++ b/src/lib-storage/index/index-attachment.c
@@ -147,7 +147,6 @@ static void index_attachment_save_mail_header(struct mail_save_context *ctx,
 static bool save_is_attachment(struct mail_save_context *ctx,
                               struct message_part *part)
 {
-       struct mailbox *box = ctx->transaction->box;
        struct mail_attachment_part apart;
 
        if ((part->flags & MESSAGE_PART_FLAG_MULTIPART) != 0) {
@@ -155,14 +154,14 @@ static bool save_is_attachment(struct mail_save_context *ctx,
                   but they're never themselves */
                return FALSE;
        }
-       if (box->v.save_is_attachment == NULL)
+       if (ctx->part_is_attachment == NULL)
                return TRUE;
 
        memset(&apart, 0, sizeof(apart));
        apart.part = part;
        apart.content_type = ctx->attach->part.content_type;
        apart.content_disposition = ctx->attach->part.content_disposition;
-       return box->v.save_is_attachment(ctx, &apart);
+       return ctx->part_is_attachment(ctx, &apart);
 }
 
 static int index_attachment_save_temp_open_fd(struct mail_storage *storage)

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index ef361b17b0b6a3437fab80acb6a99f418e5259b0..181d45a1dc73c25690f8ec2513e73b98adb89ee4 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -667,7 +667,6 @@ struct mailbox maildir_mailbox = {
                maildir_save_finish,
                maildir_save_cancel,
                maildir_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index eeafdbeb0a1f9829456c1d05b8acc6a30e721f4b..ef371d5347cbcfca382365964a1a137edd080639 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -771,7 +771,6 @@ struct mailbox mbox_mailbox = {
                mbox_save_finish,
                mbox_save_cancel,
                mail_storage_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 1e2836bce6cfc71cbc2a20ec5ee19d8891972073..45566c394a88935ebef83574d138b0a7b8ef471e 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -167,7 +167,6 @@ struct mailbox raw_mailbox = {
                NULL,
                NULL,
                mail_storage_copy,
-               NULL,
                index_storage_is_inconsistent
        }
 };

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 61e132a554d54e5b9350e62710112e4eac531c7b..26e1f98b3bfd04c82a8b0abf066a757d60babfe5 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -175,9 +175,6 @@ struct mailbox_vfuncs {
        int (*save_finish)(struct mail_save_context *ctx);
        void (*save_cancel)(struct mail_save_context *ctx);
        int (*copy)(struct mail_save_context *ctx, struct mail *mail);
-       /* returns TRUE if message part is an attachment. */
-       bool (*save_is_attachment)(struct mail_save_context *ctx,
-                                  const struct mail_attachment_part *part);
 
        bool (*is_inconsistent)(struct mailbox *box);
 };
@@ -411,6 +408,10 @@ struct mail_save_context {
 
        struct mail_save_attachment *attach;
 
+       /* returns TRUE if message part is an attachment. */
+       bool (*part_is_attachment)(struct mail_save_context *ctx,
+                                  const struct mail_attachment_part *part);
+
        /* we came here from mailbox_copy() */
        unsigned int copying:1;
 };

diff --git a/src/lib-storage/test-mailbox.c b/src/lib-storage/test-mailbox.c
index d2f0cf4e16f02ade53b7d0aef372f565ea1b0575..23b0627401a13a4d7c94d2254e2726e64be0ff22 100644 (file)
--- a/src/lib-storage/test-mailbox.c
+++ b/src/lib-storage/test-mailbox.c
@@ -259,7 +259,6 @@ struct mailbox test_mailbox = {
                test_mailbox_save_finish,
                test_mailbox_save_cancel,
                test_mailbox_copy,
-               NULL,
                test_mailbox_is_inconsistent
        }
 };

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index 8cd9830bfbba7d68443962de40224424cac96b6b..60654b352df0456745284deb34d80726ad6bb044 100644 (file)
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -540,7 +540,6 @@ struct mailbox virtual_mailbox = {
                virtual_save_finish,
                virtual_save_cancel,
                mail_storage_copy,
-               NULL,
                virtual_is_inconsistent
        }
 };