See ChangeLog
Monotone-Parent: bd604d08baed0cf7905c0c78a513a7e7a9621223 Monotone-Revision: 00ffb0295fd6e6526c1e1132bcd23e8726c80997 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-11-26T14:53:30 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
90f4187c98
commit
55c9719b11
|
@ -9,7 +9,7 @@
|
|||
|
||||
2009-11-24 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/NSData+Mail.m (-decodedString): renamed from
|
||||
* SoObjects/Mailer/NSData+Mail.m (-decodedHeader): renamed from
|
||||
decodedSubject. The decoding algorithm is now recursive.
|
||||
|
||||
* SoObjects/Mailer/NSString+Mail.m (-decodedHeader): renamed from
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
@interface NSData (SOGoMailUtilities)
|
||||
|
||||
- (NSData *) bodyDataFromEncoding: (NSString *) encoding;
|
||||
- (NSString *) decodedString;
|
||||
- (NSString *) decodedHeader;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
/*
|
||||
* Excpected form is: "=?charset?encoding?encoded text?=".
|
||||
*/
|
||||
- (NSString *) decodedString
|
||||
- (NSString *) decodedHeader
|
||||
{
|
||||
const char *cData;
|
||||
unsigned int len, i, j;
|
||||
|
@ -140,7 +140,7 @@
|
|||
// Recursively decode the remaining part
|
||||
decodedString = [NSString stringWithFormat: @"%@%@",
|
||||
decodedString,
|
||||
[[self subdataWithRange: NSMakeRange(j, len-j)] decodedString]];
|
||||
[[self subdataWithRange: NSMakeRange(j, len-j)] decodedHeader]];
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -443,7 +443,7 @@ convertChars (const char *oldString, unsigned int oldLength,
|
|||
NSString *decodedHeader;
|
||||
|
||||
decodedHeader = [[self dataUsingEncoding: NSASCIIStringEncoding]
|
||||
decodedString];
|
||||
decodedHeader];
|
||||
if (!decodedHeader)
|
||||
decodedHeader = self;
|
||||
|
||||
|
|
|
@ -162,7 +162,7 @@
|
|||
// -stringByDecodingQuotedPrintable for all details
|
||||
if ([baseSubject isKindOfClass: [NSString class]])
|
||||
baseSubject = [baseSubject dataUsingEncoding: NSASCIIStringEncoding];
|
||||
subject = [baseSubject decodedString];
|
||||
subject = [baseSubject decodedHeader];
|
||||
|
||||
if (![subject length])
|
||||
subject = [self labelForKey: @"Untitled"];
|
||||
|
|
Loading…
Reference in New Issue