diff options
-rw-r--r-- | frm/frm.c | 11 | ||||
-rw-r--r-- | mail/from.c | 4 |
2 files changed, 8 insertions, 7 deletions
@@ -171,13 +171,13 @@ get_personal (header_t hdr, const char *field, char *personal, size_t buflen) char hfield[512]; int status; /* Empty string. */ *hfield = '\0'; - status = header_get_value (hdr, field, hfield, sizeof (hfield), NULL); + status = header_get_value_unfold (hdr, field, hfield, sizeof (hfield), NULL); if (status == 0) { address_t address = NULL; size_t len = 0; address_create (&address, hfield); address_get_personal (address, 1, personal, buflen, &len); @@ -239,14 +239,14 @@ action (observer_t o, size_t type) if (show_number) printf ("%d: ", counter); if (show_field) { char hfield[256]; - int status = header_get_value (hdr, show_field, hfield, - sizeof (hfield), NULL); + int status = header_get_value_unfold (hdr, show_field, hfield, + sizeof (hfield), NULL); if (status == 0) printf ("%s", hfield); } if (show_to) { @@ -269,14 +269,15 @@ action (observer_t o, size_t type) printf ("-----\t"); } if (show_subject) { char hsubject[64]; - int status = header_get_value (hdr, MU_HEADER_SUBJECT, hsubject, - sizeof (hsubject), NULL); + int status = header_get_value_unfold (hdr, MU_HEADER_SUBJECT, + hsubject, + sizeof (hsubject), NULL); if(status == 0) printf("%s", hsubject); } printf ("\n"); break; } diff --git a/mail/from.c b/mail/from.c index 0e2f6e90e..805b783ed 100644 --- a/mail/from.c +++ b/mail/from.c @@ -35,13 +35,13 @@ mail_from0 (msgset_t *mspec, message_t msg, void *data) size_t m_size = 0, m_lines = 0; const char *p; struct tm tm; mu_timezone tz; message_get_header (msg, &hdr); - if (header_aget_value (hdr, MU_HEADER_FROM, &from) == 0) + if (header_aget_value_unfold (hdr, MU_HEADER_FROM, &from) == 0) { address_t address = NULL; if (address_create (&address, from) == 0) { char name[128]; size_t len = strlen (from) + 1; @@ -54,13 +54,13 @@ mail_from0 (msgset_t *mspec, message_t msg, void *data) } else address_get_email (address, 1, from, len, NULL); address_destroy (&address); } } - header_aget_value (hdr, MU_HEADER_SUBJECT, &subj); + header_aget_value_unfold (hdr, MU_HEADER_SUBJECT, &subj); message_get_attribute (msg, &attr); if (attribute_is_userflag (attr, MAIL_ATTRIBUTE_MBOXED)) cflag = 'M'; else if (attribute_is_userflag (attr, MAIL_ATTRIBUTE_SAVED)) |