lib-lda, lib-storage: Use mail_event()

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index e2614c3e43f7e3fb40dd846e7f5d6af30b465672..2027b0b5762f996bead0c1f51e368835c9ca0584 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -89,7 +89,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx,
                return -1;
        }
 
-       e_debug(mail->event, "Sending a rejection to <%s>: %s",
+       e_debug(mail_event(mail), "Sending a rejection to <%s>: %s",
                smtp_address_encode(return_addr),
                str_sanitize(reason, 512));
 

diff --git a/src/lib-storage/mail.c b/src/lib-storage/mail.c
index f1a63fdac441276349808ee2d6df2097551838d6..252680542e5dbfbd0aab2942c73f9f54f6008134 100644 (file)
--- a/src/lib-storage/mail.c
+++ b/src/lib-storage/mail.c
@@ -668,7 +668,8 @@ void mail_opened_event(struct mail *mail)
 {
        struct mail_private *pmail =
                container_of(mail, struct mail_private, mail);
-       struct event_passthrough *e = event_create_passthrough(mail->event)->
+       struct event_passthrough *e =
+               event_create_passthrough(mail_event(mail))->
                set_name("mail_opened")->
                add_str("reason", pmail->get_stream_reason);
        if (pmail->get_stream_reason != NULL)
@@ -680,7 +681,8 @@ void mail_opened_event(struct mail *mail)
 
 void mail_expunge_requested_event(struct mail *mail)
 {
-       struct event_passthrough *e = event_create_passthrough(mail->event)->
+       struct event_passthrough *e =
+               event_create_passthrough(mail_event(mail))->
                set_name("mail_expunge_requested")->
                add_int("uid", mail->uid)->
                add_int("seq", mail->seq);