Author: rfm
Date: Fri Aug 28 16:06:35 2015
New Revision: 38938
URL: http://svn.gna.org/viewcvs/gnustep?rev=38938&view=rev
Log:
tweak
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=38938&r1=38937&r2=38938&view=diff
==============================================================================
--- libs/base/trunk/Source/Additions/GSMime.m (original)
+++ libs/base/trunk/Source/Additions/GSMime.m Fri Aug 28 16:06:35 2015
@@ -5409,7 +5409,7 @@
NSString *s = [hdr objectForKey: @"Subtype"];
NSStringEncoding enc;
- if (charset == nil)
+ if (nil == charset)
{
/* Treat xml as a special case ... if we have no charset
* specified then we can get the charset from the xml header
@@ -5418,12 +5418,16 @@
{
charset = [documentClass charsetForXml: content];
}
- if (charset == nil)
+ if (nil == charset)
{
charset = @"utf-8";
}
}
enc = [documentClass encodingFromCharset: charset];
+ if (NSASCIIStringEncoding == enc)
+ {
+ enc = NSUTF8StringEncoding;
+ }
s = [NSStringClass allocWithZone: NSDefaultMallocZone()];
s = [s initWithData: content encoding: enc];
IF_NO_GC([s autorelease];)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
