pop3: Replace mailbox_set_reason() with reason_code=pop3:initialize

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 3e08cb03519ee479c2aa140137b5fb0a6ad22914..572a82df7292f2c9fd78120bcb59ef3231ca0054 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -218,7 +218,11 @@ static void client_init_session(struct client *client)
                        return; /* no need to propagate an error */
        }
 
-       if (client_init_mailbox(client, &error) < 0) {
+       struct event_reason *reason = event_reason_begin("pop3:initialize");
+       int ret = client_init_mailbox(client, &error);
+       event_reason_end(&reason);
+
+       if (ret < 0) {
                i_error("%s", error);
                client_destroy(client, error);
        }

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index d06ced8dc1ce7600efe750ff880cfb35eeb74c93..65553c7248b47d4f9789faf48486a6f73e1854ac 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -457,7 +457,6 @@ int client_init_mailbox(struct client *client, const char **error_r)
        if (!client->set->pop3_no_flag_updates)
                flags |= MAILBOX_FLAG_DROP_RECENT;
        client->mailbox = mailbox_alloc(client->inbox_ns->list, "INBOX", flags);
-       mailbox_set_reason(client->mailbox, "POP3 INBOX");
        if (mailbox_open(client->mailbox) < 0) {
                *error_r = t_strdup_printf("Couldn't open INBOX: %s",
                        mailbox_get_last_internal_error(client->mailbox, NULL));