amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-06 19:09:43 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 72e46ed049fae790f8f694c94e8ab035260d1289
Monotone-Revision: e80fcb63581735f3366500b850eb549e8db6292f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2007-12-12T16:47:01
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2007-12-12 16:47:01 +00:00
parent 53ab38a3c1
commit ae9f5def85
4 changed files with 25 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2007-12-12 Ludovic Marcotte <ludovic@inverse.ca>
* UI/MailPartViewers/UIxMailRenderingContext.{h,m}
Removed template caching which added very little
and created re-entrant issues.
* UI/MailPartViewers/UIxMailPartHTMLViewer.m
Added a hack (and stated so in the source file)
to avoid what seems to be a bug in libxml.
2007-12-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
UI/MailPartViewers/UIxMailPartHTMLViewer.m
+9 -3
View File
@@ -298,8 +298,6 @@
- (void) characters: (unichar *) _chars
length: (int) _len
{
NSString *tmpString;
showWhoWeAre();
if (!inScript)
{
@@ -307,8 +305,16 @@
[self _appendStyle: _chars length: _len];
else if (inBody)
{
NSString *tmpString;
tmpString = [NSString stringWithCharacters: _chars length: _len];
[result appendString: [tmpString stringByEscapingHTMLString]];
// HACK: This is to avoid appending the useless junk in the <html> tag
// that Outlook adds. It seems to confuse the XML parser for
// forwarded messages as we get this in the _body_ of the email
// while we really aren't in it!
if (![tmpString hasPrefix: @" xmlns:v=\"urn:schemas-microsoft-com:vml\""])
[result appendString: [tmpString stringByEscapingHTMLString]];
}
}
}
UI/MailPartViewers/UIxMailRenderingContext.h
-7
View File
@@ -43,13 +43,6 @@
WOComponent *viewer; /* non-retained! */
WOContext *context; /* non-retained! */
NSDictionary *flatContents; /* IMAP4 name to NSData */
WOComponent *textViewer;
WOComponent *imageViewer;
WOComponent *linkViewer;
WOComponent *messageViewer;
WOComponent *iCalViewer;
WOComponent *htmlViewer;
}
- (id) initWithViewer: (WOComponent *) _viewer
UI/MailPartViewers/UIxMailRenderingContext.m
+6 -61
View File
@@ -72,32 +72,13 @@ static BOOL showNamedTextAttachmentsInline = NO;
- (void) dealloc
{
[flatContents release];
[iCalViewer release];
[htmlViewer release];
[textViewer release];
[imageViewer release];
[linkViewer release];
[messageViewer release];
[super dealloc];
}
- (void) reset
{
[flatContents release];
[iCalViewer release];
[htmlViewer release];
[textViewer release];
[imageViewer release];
[linkViewer release];
[messageViewer release];
flatContents = nil;
iCalViewer = nil;
textViewer = nil;
imageViewer = nil;
htmlViewer = nil;
linkViewer = nil;
messageViewer = nil;
}
/* fetching */
@@ -151,68 +132,32 @@ static BOOL showNamedTextAttachmentsInline = NO;
- (WOComponent *) textViewer
{
if (!textViewer)
{
textViewer = [viewer pageWithName: @"UIxMailPartTextViewer"];
[textViewer retain];
}
return textViewer;
return [viewer pageWithName: @"UIxMailPartTextViewer"];
}
- (WOComponent *) imageViewer
{
if (!imageViewer)
{
imageViewer = [viewer pageWithName: @"UIxMailPartImageViewer"];
[imageViewer retain];
}
return imageViewer;
return [viewer pageWithName: @"UIxMailPartImageViewer"];
}
- (WOComponent *) linkViewer
{
if (!linkViewer)
{
linkViewer = [viewer pageWithName: @"UIxMailPartLinkViewer"];
[linkViewer retain];
}
return linkViewer;
return [viewer pageWithName: @"UIxMailPartLinkViewer"];
}
- (WOComponent *) htmlViewer
{
if (!htmlViewer)
{
htmlViewer = [viewer pageWithName: @"UIxMailPartHTMLViewer"];
[htmlViewer retain];
}
return htmlViewer;
return [viewer pageWithName: @"UIxMailPartHTMLViewer"];
}
- (WOComponent *) messageViewer
{
if (!messageViewer)
{
messageViewer = [viewer pageWithName: @"UIxMailPartMessageViewer"];
[messageViewer retain];
}
return messageViewer;
return [viewer pageWithName: @"UIxMailPartMessageViewer"];
}
- (WOComponent *) iCalViewer
{
if (!iCalViewer)
{
iCalViewer = [viewer pageWithName: @"UIxMailPartICalViewer"];
[iCalViewer retain];
}
return iCalViewer;
return [viewer pageWithName: @"UIxMailPartICalViewer"];
}
/* Kolab viewers */