merge with base/masterHEADmaster

1 files changed, 8 insertions, 8 deletions

diff --git a/antispam-storage-1.1.c b/antispam-storage-1.1.c
index 80c80e3..e21ac82 100644
--- a/antispam-storage-1.1.c
+++ b/antispam-storage-1.1.c
@@ -127,8 +127,8 @@ antispam_copy(struct mailbox_transaction_context *t, struct mail *mail,
 	if (asbox->save_hack || asbox->movetype == MMT_UNINTERESTING)
 		ret = 0;
 	else
-		ret = backend_handle_mail(t, ast->backendctx, dest_mail,
-					  move_to_class(asbox->movetype));
+		ret = backend->handle_mail(t, ast->backendctx, dest_mail,
+					   move_to_class(asbox->movetype));
 
 	/*
 	 * Both save_hack and movetype are only valid within a copy operation,
@@ -247,9 +247,9 @@ static int antispam_save_finish(struct mail_save_context *ctx)
 		}
 		/* fall through */
 	default:
-		ret = backend_handle_mail(ctx->transaction, ast->backendctx,
-					  dest_mail,
-					  move_to_class(asbox->movetype));
+		ret = backend->handle_mail(ctx->transaction, ast->backendctx,
+					   dest_mail,
+					   move_to_class(asbox->movetype));
 	}
 
 	return ret;
@@ -260,7 +260,7 @@ antispam_transaction_begin(struct mailbox *box)
 {
 	struct antispam_transaction_context *ast;
 
-	ast = backend_start(box);
+	ast = backend->start(box);
 	i_assert(ast != NULL);
 
 	return ast;
@@ -271,7 +271,7 @@ antispam_transaction_rollback(struct antispam_transaction_context **_ast)
 {
 	struct antispam_transaction_context *ast = *_ast;
 
-	backend_rollback(ast);
+	backend->rollback(ast);
 	*_ast = NULL;
 }
 
@@ -282,7 +282,7 @@ antispam_transaction_commit(struct mailbox_transaction_context *ctx,
 	struct antispam_transaction_context *ast = *_ast;
 	int ret;
 
-	ret = backend_commit(ctx, ast);
+	ret = backend->commit(ctx, ast);
 	*_ast = NULL;
 	return ret;
 }