From 3371a4712d6e7557457aca509356624fecc356e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 11 Aug 2010 19:20:17 +0000 Subject: [PATCH] Monotone-Parent: ef0808300fb0a2f855c131c8d4958cef75bb1a1c Monotone-Revision: e55c7e9b0d4eff602ecb06071b3c60c6e2c19bf0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-11T19:20:17 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 5 +++++ SOPE/NGCards/NGVCardPhoto.m | 8 +++++++- SOPE/NGCards/versitCardsSaxDriver/ChangeLog | 8 +++++++- SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m | 9 ++++++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index e03b9a050..91fb55d8a 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,8 @@ +2010-08-11 Wolfgang Sourdeau + + * NGVCardPhoto.m (-type): returns @"JPEG" if the type is + unspecified. + 2010-07-21 Wolfgang Sourdeau * iCalXMLRenderer.m (_appendPaddingValues:withTag:intoString:): diff --git a/SOPE/NGCards/NGVCardPhoto.m b/SOPE/NGCards/NGVCardPhoto.m index ce00238ec..17cf02040 100644 --- a/SOPE/NGCards/NGVCardPhoto.m +++ b/SOPE/NGCards/NGVCardPhoto.m @@ -37,7 +37,13 @@ - (NSString *) type { - return [[self value: 0 ofAttribute: @"type"] uppercaseString]; + NSString *type; + + type = [[self value: 0 ofAttribute: @"type"] uppercaseString]; + if (!type) + type = @"JPEG"; + + return type; } - (NSData *) decodedContent diff --git a/SOPE/NGCards/versitCardsSaxDriver/ChangeLog b/SOPE/NGCards/versitCardsSaxDriver/ChangeLog index 5afb1fde4..fe4545dcd 100644 --- a/SOPE/NGCards/versitCardsSaxDriver/ChangeLog +++ b/SOPE/NGCards/versitCardsSaxDriver/ChangeLog @@ -1,3 +1,9 @@ +2010-08-11 Wolfgang Sourdeau + + * VSSaxDriver.m (_parseAttr:forTag:intoAttr:intoValue:): when no + attribute tag is not specified and the value is "BASE64" or "B", the + attribute tag is set to "ENCODING". + 2010-05-05 Wolfgang Sourdeau * VSSaxDriver.m (_endComponent:value:): avoid a crash occurring @@ -38,7 +44,7 @@ * VSSaxDriver.m: improved error reporting in case no data could be retrieved from a URL (v4.5.22) - + 2005-12-05 Helge Hess * v4.5.21 diff --git a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m index 4b6763941..3686c9c54 100644 --- a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m +++ b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m @@ -325,7 +325,7 @@ static NSCharacterSet *whitespaceCharSet = nil; intoValue: (NSString **) value_ { NSRange r; - NSString *attrName, *attrValue; + NSString *attrName, *attrValue, *upperAttr; r = [_attr rangeOfCharacterFromSet: equalSignCharSet]; if (r.length > 0) @@ -360,13 +360,16 @@ static NSCharacterSet *whitespaceCharSet = nil; } else { - if ([[_attr uppercaseString] isEqualToString: @"QUOTED-PRINTABLE"]) + upperAttr = [_attr uppercaseString]; + if ([upperAttr isEqualToString: @"QUOTED-PRINTABLE"] + || [upperAttr isEqualToString: @"BASE64"] + || [upperAttr isEqualToString: @"B"]) attrName = @"ENCODING"; else attrName = @"TYPE"; attrValue = _attr; } - + #if 0 // ZNeK: what's this for? r = [attrValue rangeOfCharacterFromSet: commaCharSet];