# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1187274945 -10800
# Node ID a8d5d826318b941b2eb54a58fe014aa00065370f
# Parent  8bca8efebfcf30c59ae174e2431e2118c08ce7b2
Call mail_alloc/mail_free, not index_mail_alloc/index_mail/free directly.

diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/cydir/cydir-save.c
--- a/src/lib-storage/index/cydir/cydir-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/cydir/cydir-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -111,7 +111,7 @@
 
 	if (dest_mail == NULL) {
 		if (ctx->mail == NULL)
-			ctx->mail = index_mail_alloc(_t, 0, NULL);
+			ctx->mail = mail_alloc(_t, 0, NULL);
 		dest_mail = ctx->mail;
 	}
 	mail_set_seq(dest_mail, ctx->seq);
@@ -299,7 +299,7 @@
 		(void)cydir_sync_finish(&ctx->sync_ctx, FALSE);
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	i_free(ctx->tmp_basename);
 	i_free(ctx);
 }
diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -190,7 +190,7 @@
 			struct mailbox_transaction_context *_t =
 				&t->ictx.mailbox_ctx;
 
-			ctx->mail = index_mail_alloc(_t, 0, NULL);
+			ctx->mail = mail_alloc(_t, 0, NULL);
 		}
 		dest_mail = ctx->mail;
 	}
@@ -708,7 +708,7 @@
 		maildir_uidlist_get_uid_validity(ctx->mbox->uidlist);
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	pool_unref(ctx->pool);
 }
 
@@ -756,6 +756,6 @@
 	t_pop();
 
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	pool_unref(ctx->pool);
 }
diff -r 8bca8efebfcf -r a8d5d826318b src/lib-storage/index/mbox/mbox-save.c
--- a/src/lib-storage/index/mbox/mbox-save.c	Thu Aug 16 17:28:33 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-save.c	Thu Aug 16 17:35:45 2007 +0300
@@ -450,7 +450,7 @@
 		/* parse and cache the mail headers as we read it */
 		if (dest_mail == NULL) {
 			if (ctx->mail == NULL)
-				ctx->mail = index_mail_alloc(_t, 0, NULL);
+				ctx->mail = mail_alloc(_t, 0, NULL);
 			dest_mail = ctx->mail;
 		}
 		mail_set_seq(dest_mail, ctx->seq);
@@ -643,7 +643,7 @@
 	if (ctx->output != NULL)
 		o_stream_destroy(&ctx->output);
 	if (ctx->mail != NULL)
-		index_mail_free(ctx->mail);
+		mail_free(&ctx->mail);
 	str_free(&ctx->headers);
 	i_free(ctx);
 }