From: helge Date: Sun, 3 Oct 2004 23:19:54 +0000 (+0000) Subject: minor improvements X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe2ec076f98896dbafd518db46d9b5db7073a04d;p=scalable-opengroupware.org minor improvements git-svn-id: http://svn.opengroupware.org/SOGo/trunk@352 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index ab7fbe12..ac1e4187 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,5 +1,7 @@ 2004-10-04 Helge Hess + * SOGoMailBodyPart.m: improved MIME type generation (v0.9.24) + * SOGoMailBodyPart.m, SOGoMailObject.m: finished first part fetching support (v0.9.23) diff --git a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m index 828eb7a5..d2fd45cd 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m +++ b/SOGo/SoObjects/Mailer/SOGoMailBodyPart.m @@ -150,16 +150,33 @@ /* WebDAV */ - (NSString *)contentTypeForBodyPartInfo:(id)_info { - NSString *mt, *st; + NSMutableString *type; + NSString *mt, *st; + NSDictionary *parameters; + NSEnumerator *ke; + NSString *pn; if (![_info isNotNull]) return nil; mt = [_info valueForKey:@"type"]; if (![mt isNotNull]) return nil; st = [_info valueForKey:@"subtype"]; if (![st isNotNull]) return nil; - - // TODO: we could add the parameter list?! - return [[mt stringByAppendingString:@"/"] stringByAppendingString:st]; + + type = [NSMutableString stringWithCapacity:16]; + [type appendString:mt]; + [type appendString:@"/"]; + [type appendString:st]; + + parameters = [_info valueForKey:@"parameterList"]; + ke = [parameters keyEnumerator]; + while ((pn = [ke nextObject])) { + [type appendString:@"; "]; + [type appendString:pn]; + [type appendString:@"=\""]; + [type appendString:[[parameters objectForKey:pn] stringValue]]; + [type appendString:@"\""]; + } + return type; } - (NSString *)davContentType { diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index 8a19b3e3..a281cca1 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=23 +SUBMINOR_VERSION:=24 diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 01c54cd5..64c28236 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,5 +1,7 @@ 2004-10-04 Helge Hess + * UIxMailView.m: added 'currentAddress' accessors (v0.9.14) + * UIxMailView.m: use core infos stored in message SoObject for display (v0.9.13) diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/Mailer/UIxMailView.m index 68e09945..4061a34a 100644 --- a/SOGo/UI/Mailer/UIxMailView.m +++ b/SOGo/UI/Mailer/UIxMailView.m @@ -49,6 +49,15 @@ [super sleep]; } +/* accessors */ + +- (void)setCurrentAddress:(id)_addr { + ASSIGN(self->currentAddress, _addr); +} +- (id)currentAddress { + return self->currentAddress; +} + /* fetching */ - (id)message { diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version index 92c8fa08..cc039aca 100644 --- a/SOGo/UI/Mailer/Version +++ b/SOGo/UI/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=13 +SUBMINOR_VERSION:=14