From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 23 Oct 2016 20:29:49 +0000 (+0200)
Subject: lib-imap: imap-envelope: Moved imap_envelope_headers to lib-mail/message-part-data... 
X-Git-Tag: 2.3.0.rc1~2225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=042a58438dc324c6d4de18e4c8a68044d6328e66;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap: imap-envelope: Moved imap_envelope_headers to lib-mail/message-part-data as message_part_envelope_headers.
---

diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index d417ec9311..a1067eb2f1 100644
--- a/src/lib-imap/imap-envelope.c
+++ b/src/lib-imap/imap-envelope.c
@@ -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) {
diff --git a/src/lib-imap/imap-envelope.h b/src/lib-imap/imap-envelope.h
index 4bea110eb2..8d505dda62 100644
--- a/src/lib-imap/imap-envelope.h
+++ b/src/lib-imap/imap-envelope.h
@@ -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);
diff --git a/src/lib-mail/message-part-data.c b/src/lib-mail/message-part-data.c
index f3cacc72d3..363fc2e4f3 100644
--- a/src/lib-mail/message-part-data.c
+++ b/src/lib-mail/message-part-data.c
@@ -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
+};
+
 /*
  *
  */
diff --git a/src/lib-mail/message-part-data.h b/src/lib-mail/message-part-data.h
index fc7bfb3d8e..0a581edb53 100644
--- a/src/lib-mail/message-part-data.h
+++ b/src/lib-mail/message-part-data.h
@@ -38,6 +38,8 @@ struct message_part_data {
 	struct message_part_envelope_data *envelope;
 };
 
+extern const char *message_part_envelope_headers[];
+
 /*
  *
  */
diff --git a/src/lib-storage/index/imapc/imapc-mail.c b/src/lib-storage/index/imapc/imapc-mail.c
index badd52e928..d0775ceeb5 100644
--- a/src/lib-storage/index/imapc/imapc-mail.c
+++ b/src/lib-storage/index/imapc/imapc-mail.c
@@ -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 @@ void imapc_mail_update_access_parts(struct index_mail *mail)
 		/* 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);
diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index b2d9f2ba71..9d856de31c 100644
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -499,7 +499,7 @@ int index_mail_headers_get_envelope(struct index_mail *mail)
 
 	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;