Author: rfm
Date: Tue Jun 7 18:45:56 2016
New Revision: 39849
URL: http://svn.gna.org/viewcvs/gnustep?rev=39849&view=rev
Log:
tweak again
Modified:
libs/base/trunk/Source/Additions/GSMime.m
Modified: libs/base/trunk/Source/Additions/GSMime.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/Additions/GSMime.m?rev=39849&r1=39848&r2=39849&view=diff
==============================================================================
--- libs/base/trunk/Source/Additions/GSMime.m (original)
+++ libs/base/trunk/Source/Additions/GSMime.m Tue Jun 7 18:45:56 2016
@@ -5738,25 +5738,42 @@
|| YES == [v isEqualToString: @"binary"]
|| YES == [v isEqualToString: @"8bit"])
{
- NSString *t = [[self headerNamed: @"content-type"] value];
-
- if (YES == [t hasPrefix: @"text/"])
- {
- t = @"quoted-printable";
+ GSMimeHeader *t = [self headerNamed: @"content-type"];
+ NSString *v;
+
+ if ([[t objectForKey: @"Type"] isEqualToString: @"text"] == YES)
+ {
+ NSString *charset;
+ NSStringEncoding e;
+
+ charset = [t parameterForKey: @"charset"];
+ e = [documentClass encodingFromCharset: charset];
+#if defined(NeXT_Foundation_LIBRARY)
+ if (e != NSASCIIStringEncoding)
+#else
+ if (e != NSASCIIStringEncoding && e != NSUTF7StringEncoding)
+#endif
+ {
+ v = @"quoted-printable";
+ }
+ else
+ {
+ v = @"7bit";
+ }
}
else
{
- t = @"base64";
+ v = @"base64";
}
if (nil == h)
{
[self setHeader: @"Content-Transfer-Encoding"
- value: t
+ value: v
parameters: nil];
}
else
{
- [h setValue: t];
+ [h setValue: v];
}
}
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
