imap: add variables to default imap_logout_format

diff --git a/doc/example-config/conf.d/20-imap.conf b/doc/example-config/conf.d/20-imap.conf
index b7dd95dfa0e91233f5d10888cea95640c24c706c..f10ae87f4abd7d16ad2ef14202d77626d2c75f76 100644 (file)
--- a/doc/example-config/conf.d/20-imap.conf
+++ b/doc/example-config/conf.d/20-imap.conf
@@ -24,7 +24,10 @@
 #  %{expunged} - Number of mails that client expunged
 #  %{trashed} - Number of mails that client copied/moved to the
 #               special_use=\Trash mailbox.
-#imap_logout_format = in=%i out=%o
+#imap_logout_format = in=%i out=%o del=%{deleted} expunged=%{expunged} \
+#  trashed=%{trashed} hdr_count=%{fetch_hdr_count} \
+#  hdr_bytes=%{fetch_hdr_bytes} body_count=%{fetch_body_count} \
+#  body_bytes=%{fetch_body_bytes}
 
 # Override the IMAP CAPABILITY response. If the value begins with '+',
 # add the given capabilities on top of the defaults (e.g. +XFOO XBAR).

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index d1668e6910a74c81a4695eb058058838fc58244a..5355e8fe4da3066000b7726ec89ebf66269374cc 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -89,7 +89,10 @@ static const struct imap_settings imap_default_settings = {
        .imap_idle_notify_interval = 2*60,
        .imap_capability = "",
        .imap_client_workarounds = "",
-       .imap_logout_format = "in=%i out=%o",
+       .imap_logout_format = "in=%i out=%o deleted=%{deleted} "
+               "expunged=%{expunged} trashed=%{trashed} "
+               "hdr_count=%{fetch_hdr_count} hdr_bytes=%{fetch_hdr_bytes} "
+               "body_count=%{fetch_body_count} body_bytes=%{fetch_body_bytes}",
        .imap_id_send = "name *",
        .imap_id_log = "",
        .imap_metadata = FALSE,