diff options
| -rw-r--r-- | mail/elm+ME/Makefile | 2 | ||||
| -rw-r--r-- | mail/elm+ME/distinfo | 3 | ||||
| -rw-r--r-- | mail/elm+ME/files/patch-mailmsg2.c | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile index c7fc25cf5271..718717db4dfd 100644 --- a/mail/elm+ME/Makefile +++ b/mail/elm+ME/Makefile @@ -82,7 +82,7 @@ OPTIONS= ELM_ICONV "libiconv support" on \ ELM_VERSION= 2.4 ELM_REVISION= 124 -ELM_PATCHLEVEL= c # a...z = patch-level, _ means no patch-level. +ELM_PATCHLEVEL= d # a...z = patch-level, _ means no patch-level. ELM_PATCHDONE= false .for level in _ a b c d e f g h i j k l m n o p q r s t u v w x y z diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo index c25e116b6e4d..9359fb6e75f1 100644 --- a/mail/elm+ME/distinfo +++ b/mail/elm+ME/distinfo @@ -10,3 +10,6 @@ SIZE (elm-2.4ME+PL124b.patch.gz) = 5738 MD5 (elm-2.4ME+PL124c.patch.gz) = b4a57afb8ed3ec3571f12312a7af32e7 SHA256 (elm-2.4ME+PL124c.patch.gz) = 321b6895c0c018f0838859c68bd985edd08470e14b002b85fac96e862360022c SIZE (elm-2.4ME+PL124c.patch.gz) = 4373 +MD5 (elm-2.4ME+PL124d.patch.gz) = b4cfe09981531fad536ddc91ff425ff3 +SHA256 (elm-2.4ME+PL124d.patch.gz) = 7c2b24905e5f2375b339bb208040a410119da2ce24c379f4e6e4ebf64d3a37a1 +SIZE (elm-2.4ME+PL124d.patch.gz) = 29832 diff --git a/mail/elm+ME/files/patch-mailmsg2.c b/mail/elm+ME/files/patch-mailmsg2.c index a96d0cd9f24f..d58011e12a8f 100644 --- a/mail/elm+ME/files/patch-mailmsg2.c +++ b/mail/elm+ME/files/patch-mailmsg2.c @@ -32,17 +32,20 @@ if (!cur_editcharset) cur_editcharset = display_charset; -@@ -523,12 +539,15 @@ +@@ -523,15 +539,18 @@ hdr->env_from); } else if (attribution[0] && hdr) { + char * date = us2s(stream_from_string(Date_buffer,1,NULL)); + if (From_buffer) { - char * str = us2s(stream_from_string(From_buffer,1,NULL)); + struct string * tmp1 = convert_string(cur_editcharset, + From_buffer,1); + char * str = us2s(stream_from_string(tmp1,1,NULL)); - fprintf(reply, attribution, str); + fprintf(reply, attribution, str, date); free(str); + free_string(&tmp1); } else - fprintf(reply, attribution, hdr->env_from); + fprintf(reply, attribution, hdr->env_from, date); |