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

diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index d417ec93111436ecaa93b2bef26c0936a9a5d45a..a1067eb2f1569c33aadc68afad4d1f2e15801ed5 100644 (file)
--- 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 4bea110eb208b353cca55d6b1b147ac44acd3c12..8d505dda626a1be23297d30080c6bbb935f2659f 100644 (file)
--- 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 f3cacc72d328df9a4158c4a8d98b23fcb79ffc08..363fc2e4f3fcfa71989dff16eaebd23fd8062ebc 100644 (file)
--- 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 fc7bfb3d8e8579ccab3e8c7d22d6661fddeb6327..0a581edb5399c88416a5a15f65f785eb7af52f7b 100644 (file)
--- 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 badd52e928c0985e735857004846d06897d483f0..d0775ceeb5dc6f3fae9d3e530b7ba5e39da80f63 100644 (file)
--- 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 b2d9f2ba712efc56372c8a81fd6cff901921af02..9d856de31c867b281d952e72fd91d990fb0e65b3 100644 (file)
--- 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;