From: Timo Sirainen <tss@iki.fi>
Date: Fri, 6 Jan 2012 13:17:20 +0000 (+0200)
Subject: lib-storage: Renamed mail_save_context.copying to copying_via_save.
X-Git-Tag: 2.1.rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abec3f4c5ec486c393e1513950f2d4819dcbc30f;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Renamed mail_save_context.copying to copying_via_save.
---

diff --git a/src/lib-storage/mail-copy.c b/src/lib-storage/mail-copy.c
index 57fa7daef2..0f2155d5da 100644
--- a/src/lib-storage/mail-copy.c
+++ b/src/lib-storage/mail-copy.c
@@ -29,7 +29,7 @@ mail_storage_try_copy(struct mail_save_context **_ctx, struct mail *mail)
 	const char *from_envelope, *guid;
 	time_t received_date;
 
-	ctx->copying = TRUE;
+	ctx->copying_via_save = TRUE;
 
 	/* we need to open the file in any case. caching metadata is unlikely
 	   to help anything. */
diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index e0e2f833a6..72152bcc83 100644
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -447,8 +447,8 @@ struct mail_save_context {
 	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;
+	/* mail was copied using saving */
+	unsigned int copying_via_save:1;
 };
 
 struct mailbox_sync_context {
diff --git a/src/plugins/notify/notify-storage.c b/src/plugins/notify/notify-storage.c
index da1eade62d..bd90303f59 100644
--- a/src/plugins/notify/notify-storage.c
+++ b/src/plugins/notify/notify-storage.c
@@ -128,7 +128,7 @@ notify_save_finish(struct mail_save_context *ctx)
 {
 	union mailbox_module_context *lbox =
 		NOTIFY_CONTEXT(ctx->transaction->box);
-	struct mail *dest_mail = ctx->copying ? NULL : ctx->dest_mail;
+	struct mail *dest_mail = ctx->copying_via_save ? NULL : ctx->dest_mail;
 
 	if (lbox->super.save_finish(ctx) < 0)
 		return -1;
diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index fe7f8ebc3a..aa8228d0a0 100644
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -171,7 +171,7 @@ quota_copy(struct mail_save_context *ctx, struct mail *mail)
 		return -1;
 
 	/* if copying used saving internally, we already checked the quota */
-	return ctx->copying ? 0 : quota_check(t, ctx->dest_mail);
+	return ctx->copying_via_save ? 0 : quota_check(t, ctx->dest_mail);
 }
 
 static int