force rfc2047_parameters to be set to yes, and non configureable.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/init.h b/init.h
index 9895751..841ae38 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2971,26 +2971,6 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, Madmutt will
    ** override any such real names with the setting of the $realname variable.
    */
-  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" },
-  /*
-   ** .pp
-   ** When this variable is \fIset\fP, Madmutt will decode RFC-2047-encoded MIME 
-   ** parameters. You want to set this variable when Madmutt suggests you
-   ** to save attachments to files named like this:
-   ** .pp
-   **  \fT=?iso-8859-1?Q?file=5F=E4=5F991116=2Ezip?=\fP
-   ** .pp
-   ** When this variable is \fIset\fP interactively, the change doesn't have
-   ** the desired effect before you have changed folders.
-   ** .pp
-   ** Note that this use of RFC 2047's encoding is explicitly,
-   ** prohibited by the standard, but nevertheless encountered in the
-   ** wild.
-   ** .pp
-   ** Also note that setting this parameter will \fInot\fP have the effect 
-   ** that Madmutt \fIgenerates\fP this kind of encoding.  Instead, Madmutt will
-   ** unconditionally use the encoding specified in RFC 2231.
-   */
   {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" },
   /*
    ** .pp
@@ -3687,7 +3667,8 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
+  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "no" },
+  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "yes"},
   { NULL, -1, R_NONE, -1, NULL }
 };
 

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 24f8ba2..7cd45d2 100644 (file)
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -233,7 +233,7 @@ void rfc2231_decode_parameters (parameter_t ** headp)
              * Internet Gateways.  So we actually decode it.
              */
 
-            if (option(OPTRFC2047PARAMS) && p->value && strstr(p->value, "=?")) {
+            if (p->value && strstr(p->value, "=?")) {
                 rfc2047_decode(&p->value);
             } else {
                 if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)