From a248c60b820cd81306bfa65dc24d39a00f9632b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Feb 2008 16:20:29 +0000 Subject: [PATCH] Monotone-Parent: d7b615d5687e4c138413b9ed635b046e284d5e5b Monotone-Revision: 027183f8ed3eb9e03f14555acbea16e275ab2933 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-02-08T16:20:29 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoMailAccount.m | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 729a3e9e6..8cd7fe1ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-02-08 Wolfgang Sourdeau + * SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount + -_urlHostString]): replace "@" with %40 AFTER invoking + stringByEscapingURL. + * SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject -isBodyPartKey:key]): hacked a little bit to test for the length of the key trimmed from its bordering digits. So if the key diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m index 7270874e5..976f3f98d 100644 --- a/SoObjects/Mailer/SOGoMailAccount.m +++ b/SoObjects/Mailer/SOGoMailAccount.m @@ -256,8 +256,8 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default { username = [mailAccount objectForKey: @"userName"]; escUsername - = [[username stringByReplacingString: @"@" withString: @"%40"] - stringByEscapingURL]; + = [[username stringByEscapingURL] stringByReplacingString: @"@" + withString: @"%40"]; hostString = [NSString stringWithFormat: @"%@@%@", escUsername, [mailAccount objectForKey: @"serverName"]]; }