Mercurial > dovecot > core-2.2
changeset 21634:e2071511ef6d
lib-imap: imap-envelope: Moved imap_envelope_headers to lib-mail/message-part-data as message_part_envelope_headers.
| author | Stephan Bosch <stephan.bosch@dovecot.fi> |
|---|---|
| date | Sun, 23 Oct 2016 22:29:49 +0200 |
| parents | 3a88d30ad000 |
| children | 30aacb0df12f |
| files | src/lib-imap/imap-envelope.c src/lib-imap/imap-envelope.h src/lib-mail/message-part-data.c src/lib-mail/message-part-data.h src/lib-storage/index/imapc/imapc-mail.c src/lib-storage/index/index-mail-headers.c |
| diffstat | 6 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-imap/imap-envelope.c Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-imap/imap-envelope.c Sun Oct 23 22:29:49 2016 +0200 @@ -10,12 +10,6 @@ #include "imap-envelope.h" #include "imap-quote.h" -const char *imap_envelope_headers[] = { - "Date", "Subject", "From", "Sender", "Reply-To", - "To", "Cc", "Bcc", "In-Reply-To", "Message-ID", - NULL -}; - static void imap_write_address(string_t *str, struct message_address *addr) { if (addr == NULL) {
--- a/src/lib-imap/imap-envelope.h Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-imap/imap-envelope.h Sun Oct 23 22:29:49 2016 +0200 @@ -4,8 +4,6 @@ struct imap_arg; struct message_part_envelope_data; -extern const char *imap_envelope_headers[]; - /* Write envelope to given string */ void imap_envelope_write_part_data(struct message_part_envelope_data *data, string_t *str);
--- a/src/lib-mail/message-part-data.c Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-mail/message-part-data.c Sun Oct 23 22:29:49 2016 +0200 @@ -10,6 +10,12 @@ #include "message-part-data.h" +const char *message_part_envelope_headers[] = { + "Date", "Subject", "From", "Sender", "Reply-To", + "To", "Cc", "Bcc", "In-Reply-To", "Message-ID", + NULL +}; + /* * */
--- a/src/lib-mail/message-part-data.h Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-mail/message-part-data.h Sun Oct 23 22:29:49 2016 +0200 @@ -38,6 +38,8 @@ struct message_part_envelope_data *envelope; }; +extern const char *message_part_envelope_headers[]; + /* * */
--- a/src/lib-storage/index/imapc/imapc-mail.c Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-storage/index/imapc/imapc-mail.c Sun Oct 23 22:29:49 2016 +0200 @@ -5,6 +5,7 @@ #include "hex-binary.h" #include "sha1.h" #include "istream.h" +#include "message-part-data.h" #include "imap-envelope.h" #include "imapc-msgmap.h" #include "imapc-mail.h" @@ -382,7 +383,7 @@ /* the common code already checked this partially, but we need a guaranteed correct answer */ header_ctx = mailbox_header_lookup_init(_mail->box, - imap_envelope_headers); + message_part_envelope_headers); if (!imapc_mail_has_headers_in_cache(mail, header_ctx)) data->access_part |= PARSE_HDR; mailbox_header_lookup_unref(&header_ctx);
--- a/src/lib-storage/index/index-mail-headers.c Sun Oct 23 20:05:33 2016 +0200 +++ b/src/lib-storage/index/index-mail-headers.c Sun Oct 23 22:29:49 2016 +0200 @@ -503,7 +503,7 @@ mail->data.save_envelope = TRUE; header_ctx = mailbox_header_lookup_init(mail->mail.mail.box, - imap_envelope_headers); + message_part_envelope_headers); if (mail_get_header_stream(&mail->mail.mail, header_ctx, &stream) < 0) { mailbox_header_lookup_unref(&header_ctx); return -1;