From b62140c5849297a800fee942026d9c3cb8c60206 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 6 Dec 2010 03:58:17 +0000 Subject: [PATCH] lib-storage: Moved mailbox.save_is_attachment() to mail_save_context.part_is_attachment() --- src/lib-storage/index/cydir/cydir-storage.c | 1 - src/lib-storage/index/dbox-multi/mdbox-storage.c | 1 - src/lib-storage/index/dbox-single/sdbox-storage.c | 1 - src/lib-storage/index/index-attachment.c | 5 ++--- src/lib-storage/index/maildir/maildir-storage.c | 1 - src/lib-storage/index/mbox/mbox-storage.c | 1 - src/lib-storage/index/raw/raw-storage.c | 1 - src/lib-storage/mail-storage-private.h | 7 ++++--- src/lib-storage/test-mailbox.c | 1 - src/plugins/virtual/virtual-storage.c | 1 - 10 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/lib-storage/index/cydir/cydir-storage.c b/src/lib-storage/index/cydir/cydir-storage.c index c5bac64f93..0d20696013 100644 --- 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 9d19e28807..577b9b4534 100644 --- 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 4cc3ea0ebf..aaf0fdff7b 100644 --- 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 0c6cbbd522..8eb3d7fc31 100644 --- 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 ef361b17b0..181d45a1dc 100644 --- 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 eeafdbeb0a..ef371d5347 100644 --- 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 1e2836bce6..45566c394a 100644 --- 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 61e132a554..26e1f98b3b 100644 --- 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 d2f0cf4e16..23b0627401 100644 --- 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 8cd9830bfb..60654b352d 100644 --- 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 } }; -- 2.47.3