dovecot-2.1: lib-storage: Renamed mail_save_context.copying to c...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/7f549b7eb77f
changeset: 13895:7f549b7eb77f
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 06 15:17:20 2012 +0200
description:
lib-storage: Renamed mail_save_context.copying to copying_via_save.

diffstat:

 src/lib-storage/mail-copy.c            |  2 +-
 src/lib-storage/mail-storage-private.h |  4 ++--
 src/plugins/notify/notify-storage.c    |  2 +-
 src/plugins/quota/quota-storage.c      |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 08e5bc9cd64a -r 7f549b7eb77f src/lib-storage/mail-copy.c
--- a/src/lib-storage/mail-copy.c	Fri Jan 06 14:24:06 2012 +0200
+++ b/src/lib-storage/mail-copy.c	Fri Jan 06 15:17:20 2012 +0200
@@ -29,7 +29,7 @@
 	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 -r 08e5bc9cd64a -r 7f549b7eb77f src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Fri Jan 06 14:24:06 2012 +0200
+++ b/src/lib-storage/mail-storage-private.h	Fri Jan 06 15:17:20 2012 +0200
@@ -447,8 +447,8 @@
 	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 -r 08e5bc9cd64a -r 7f549b7eb77f src/plugins/notify/notify-storage.c
--- a/src/plugins/notify/notify-storage.c	Fri Jan 06 14:24:06 2012 +0200
+++ b/src/plugins/notify/notify-storage.c	Fri Jan 06 15:17:20 2012 +0200
@@ -128,7 +128,7 @@
 {
 	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 -r 08e5bc9cd64a -r 7f549b7eb77f src/plugins/quota/quota-storage.c
--- a/src/plugins/quota/quota-storage.c	Fri Jan 06 14:24:06 2012 +0200
+++ b/src/plugins/quota/quota-storage.c	Fri Jan 06 15:17:20 2012 +0200
@@ -171,7 +171,7 @@
 		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