lib-imap: imap-envelope: Renamed imap_envelope_parse_header() to message_part_envelop...

diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c
index ac2eb2453fb8bcc3ce49508ba8e199adfee2e775..6f69ce995e8ae9db1e9eb146cf420fbf81a5d695 100644 (file)
--- a/src/lib-imap/imap-bodystructure.c
+++ b/src/lib-imap/imap-bodystructure.c
@@ -271,7 +271,7 @@ void message_part_data_parse_from_header(pool_t pool,
 
        if (parent_rfc822) {
                /* message/rfc822, we need the envelope */
-               imap_envelope_parse_header(pool, &part_data->envelope, hdr);
+               message_part_envelope_parse_from_header(pool, &part_data->envelope, hdr);
        }
 }
 

diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index 9061d8dcf30f8f3da64b2cfbbea60f13f132338a..1eccc2f3b178e1ae03a8414dea20371c0a7ece6d 100644 (file)
--- a/src/lib-imap/imap-envelope.c
+++ b/src/lib-imap/imap-envelope.c
@@ -94,9 +94,9 @@ envelope_get_field(const char *name)
        return ENVELOPE_FIELD_UNKNOWN;
 }
 
-void imap_envelope_parse_header(pool_t pool,
-                               struct message_part_envelope_data **data,
-                               struct message_header_line *hdr)
+void message_part_envelope_parse_from_header(pool_t pool,
+       struct message_part_envelope_data **data,
+       struct message_header_line *hdr)
 {
        struct message_part_envelope_data *d;
        enum envelope_field field;

diff --git a/src/lib-imap/imap-envelope.h b/src/lib-imap/imap-envelope.h
index 4bc30fb649d7261c8fb9667d00ba73a2838845f7..66f6d13c7c24f05d9030a40de5f61f00f9eb60b7 100644 (file)
--- a/src/lib-imap/imap-envelope.h
+++ b/src/lib-imap/imap-envelope.h
@@ -8,9 +8,9 @@ struct message_part_envelope_data;
 extern const char *imap_envelope_headers[];
 
 /* Update envelope data based from given header field */
-void imap_envelope_parse_header(pool_t pool,
-                               struct message_part_envelope_data **data,
-                               struct message_header_line *hdr);
+void message_part_envelope_parse_from_header(pool_t pool,
+       struct message_part_envelope_data **_data,
+       struct message_header_line *hdr);
 
 /* Write envelope to given string */
 void imap_envelope_write_part_data(struct message_part_envelope_data *data,

diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index 8360c9e7c4eba4b8ee60c0b424d504fcceabed4c..70c453113f98fbe1e0328c3a1ccc91a39b41e241 100644 (file)
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -297,7 +297,7 @@ void index_mail_parse_header(struct message_part *part,
        }
 
        if (data->save_envelope) {
-               imap_envelope_parse_header(mail->mail.data_pool,
+               message_part_envelope_parse_from_header(mail->mail.data_pool,
                                           &data->envelope_data, hdr);
 
                if (hdr == NULL)
@@ -473,7 +473,7 @@ static void
 imap_envelope_parse_callback(struct message_header_line *hdr,
                             struct index_mail *mail)
 {
-       imap_envelope_parse_header(mail->mail.data_pool,
+       message_part_envelope_parse_from_header(mail->mail.data_pool,
                                   &mail->data.envelope_data, hdr);
 
        if (hdr == NULL)