From 66de344a6c970d3c29380bdb828af2d4f7ef5e12 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 1 Oct 2024 18:03:30 +0200
Subject: [PATCH] plugins: imapsieve: imap-sieve-storage - Use mailbox event
 for imapsieve mailbox event

Used user event before. This will be needed for retrieving settings in mailbox
context.
---
 src/plugins/imapsieve/imap-sieve-storage.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/imapsieve/imap-sieve-storage.c b/src/plugins/imapsieve/imap-sieve-storage.c
index 4b0e6c9a2..553530e55 100644
--- a/src/plugins/imapsieve/imap-sieve-storage.c
+++ b/src/plugins/imapsieve/imap-sieve-storage.c
@@ -782,8 +782,14 @@ static void imap_sieve_mailbox_allocated(struct mailbox *box)
 	if (isuser->client == NULL || isuser->sieve_active)
 		return;
 
+	struct event *event;
+
+	event = event_create(box->event);
+	event_set_append_log_prefix(event, "imapsieve: ");
+
 	isbox = p_new(box->pool, struct imap_sieve_mailbox, 1);
 	isbox->user = isuser;
+	isbox->event = event;
 	isbox->module_ctx.super = *v;
 	box->vlast = &isbox->module_ctx.super;
 
@@ -794,11 +800,6 @@ static void imap_sieve_mailbox_allocated(struct mailbox *box)
 	v->transaction_rollback = imap_sieve_mailbox_transaction_rollback;
 	v->free = imap_sieve_mailbox_free;
 	MODULE_CONTEXT_SET(box, imap_sieve_storage_module, isbox);
-
-	isbox->event = event_create(isuser->event);
-	event_set_append_log_prefix(isbox->event,
-				    t_strdup_printf("mailbox %s: ",
-						    mailbox_get_vname(box)));
 }
 
 /*
-- 
GitLab