amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-27 00:52:45 +00:00
Code Issues Projects Releases Wiki Activity

merge of '97177e8c25666ceaaffd5ed4ce58fac2fef8354a'

Browse Source 
and 'a2e22f9ca9e5096f59327f5b4d176050ffcbf15f'

Monotone-Parent: 97177e8c25666ceaaffd5ed4ce58fac2fef8354a
Monotone-Parent: a2e22f9ca9e5096f59327f5b4d176050ffcbf15f
Monotone-Revision: a949c0a5881acabcd4cf2e8940f829cbd16b1037

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-21T22:39:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-11-21 22:39:02 +00:00
parent a421956b86 fc74f8f24f
commit 4e18eae0c5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2007-11-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailPartViewers/UIxMailPartHTMLViewer.m: fixed infinite loop
when charset is us-ascii, match it to ascii rather than none.
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder
-fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatetitle:titlecomponent:_component]):

5
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@@ -483,7 +483,7 @@
- (xmlCharEncoding) _xmlCharsetForCharset: (NSString *) charset
{
struct { NSString *name; xmlCharEncoding encoding; } xmlEncodings[] = {
{ @"us-ascii", XML_CHAR_ENCODING_NONE},
{ @"us-ascii", XML_CHAR_ENCODING_ASCII},
{ @"utf-8", XML_CHAR_ENCODING_UTF8},
{ @"utf-16le", XML_CHAR_ENCODING_UTF16LE},
{ @"utf-16be", XML_CHAR_ENCODING_UTF16BE},
@@ -505,8 +505,7 @@
{ @"iso-8859-9", XML_CHAR_ENCODING_8859_9},
{ @"iso-2022-jp", XML_CHAR_ENCODING_2022_JP},
// { @"iso-2022-jp", XML_CHAR_ENCODING_SHIFT_JIS},
{ @"euc-jp", XML_CHAR_ENCODING_EUC_JP},
{ @"us-ascii", XML_CHAR_ENCODING_ASCII}};
{ @"euc-jp", XML_CHAR_ENCODING_EUC_JP}};
unsigned count;
xmlCharEncoding encoding;