From 4e525877b2f8c2b82677a3c56cf60948ceb08dd0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 4 Jul 2007 20:23:14 +0000 Subject: [PATCH] Monotone-Parent: 120bebe836052f03cd990ffe1cf7418954873186 Monotone-Revision: 214586b6dc652f6581d2810e8828bd2d3a475295 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-07-04T20:23:14 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoMailObject.m | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec4d8026f..f64b2b057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-07-04 Wolfgang Sourdeau + * SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject + -contentAsString]): returns the message encoded in ISO Latin 1 + again. + * SoObjects/SOGo/SOGoUser.m ([SOGoUser +initialize]): read the SOGoSuperUsername user defaults. ([SOGoUser -initWithLogin:newLoginroles:newRoles]): simplified diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m index a8b76bdb2..29c6a0ea7 100644 --- a/SoObjects/Mailer/SOGoMailObject.m +++ b/SoObjects/Mailer/SOGoMailObject.m @@ -435,9 +435,8 @@ static BOOL debugSoParts = NO; if ([content isKindOfClass:[NSException class]]) return (id)content; -#warning the encoding here might be wrong... - s = [[NSString alloc] initWithData: content - encoding: NSUTF8StringEncoding]; + s = [[NSString alloc] initWithData: content + encoding: NSISOLatin1StringEncoding]; if (s == nil) { [self logWithFormat: @"ERROR: could not convert data of length %d to string",