aboutsummaryrefslogtreecommitdiffstats
path: root/mailtrain.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--mailtrain.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/mailtrain.c b/mailtrain.c
index a0e4a40..7156805 100644
--- a/mailtrain.c
+++ b/mailtrain.c
@@ -233,12 +233,7 @@ int backend_handle_mail(struct mailbox_transaction_context *t,
return -1;
}
-#ifdef CONFIG_DOVECOT_11
- if (mail_get_stream(mail, NULL, NULL, &mailstream) < 0)
- mailstream = NULL;
-#else
- mailstream = mail_get_stream(mail, NULL, NULL);
-#endif
+ mailstream = get_mail_stream(mail);
if (!mailstream) {
mail_storage_set_error(t->box->storage,
ME(EXPUNGED)
@@ -262,11 +257,7 @@ int backend_handle_mail(struct mailbox_transaction_context *t,
ast->count++;
-#ifdef CONFIG_DOVECOT_11
- outstream = o_stream_create_fd(fd, 0, TRUE);
-#else
- outstream = o_stream_create_file(fd, t->box->pool, 0, TRUE);
-#endif
+ outstream = o_stream_create_from_fd(fd, t->box->pool);
if (!outstream) {
ret = -1;
mail_storage_set_error(t->box->storage,