RfC2047 decode/encode X-Label: header (Closes #2970).

diff --git a/ChangeLog b/ChangeLog
index ef104599612fa988414c39b96b1606c3818615c0..3437a2dc51faec72e4b53210865737790639d750 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-30 08:39 +0100  Rocco Rutte  <pdmef@gmx.net>  (234c02747bb3)
+
+       * commands.c: Format status line for external and internal pager the
+       same way to make %P work
+
+2007-11-29 16:03 +0100  Rocco Rutte  <pdmef@gmx.net>  (4899bcc1c2c3)
+
+       * ChangeLog, doc/db-cleanup.xsl: Add ascii-replacements for 0x2dc
+       (tilde) and 0x2026 (...) too. The manual cannot be clean us-acii but
+       now we should have at least latin1
+
 2007-11-29 15:24 +0100  Rocco Rutte  <pdmef@gmx.net>  (c64cb80a90a6)
 
        * doc/Makefile.am, doc/db-cleanup.xsl: Add a really ugly hack to make

diff --git a/parse.c b/parse.c
index 9e5fc4c8a59e6cd593e32e0fd4bd57d6d1df3a99..2b0dae57b6afd837c07345b2e4bde8c0ccad7dac 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1435,6 +1435,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
     rfc2047_decode_adrlist (e->mail_followup_to);
     rfc2047_decode_adrlist (e->return_path);
     rfc2047_decode_adrlist (e->sender);
+    rfc2047_decode (&e->x_label);
 
     if (e->subject)
     {

diff --git a/sendlib.c b/sendlib.c
index c2ae8742727bf6caa85cd4ad2f634edb08dc9465..ab4ace2f07be06e72b8e33e7f2859e5c2993e6e3 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2342,6 +2342,7 @@ void mutt_prepare_envelope (ENVELOPE *env, int final)
   rfc2047_encode_adrlist (env->from, "From");
   rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To");
   rfc2047_encode_adrlist (env->reply_to, "Reply-To");
+  rfc2047_encode_string (&env->x_label);
 
   if (env->subject)
   {
@@ -2366,6 +2367,7 @@ void mutt_unprepare_envelope (ENVELOPE *env)
   rfc2047_decode_adrlist (env->from);
   rfc2047_decode_adrlist (env->reply_to);
   rfc2047_decode (&env->subject);
+  rfc2047_decode (&env->x_label);
 }
 
 static int _mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to, const char *resent_from,