From a0bf0ec41899a8d64f1a9c1d4bf0e6d9ad2b6815 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 8 Nov 2007 23:04:42 +0000 Subject: [PATCH] Monotone-Parent: 0d9f18d50e83859175eb80a24a1db2cb24a748e2 Monotone-Revision: 7dc4694487f6ed68847c7c82ec9cbd6abc7cd6bb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-08T23:04:42 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoGCSFolder.m | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01b581ad8..c7e3787f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-11-08 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder + +folderWithSubscriptionReference:referenceinContainer:aContainer]): + fixed a leak. + * UI/MailPartViewers/UIxMailPartHTMLViewer.m ([UIxMailPartHTMLViewer -_attachmentIds]): the reference was one character too short, which cause the images not to be displayed diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index cf6f1296e..8bd4e6260 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -61,7 +61,7 @@ static NSString *defaultUserID = @""; { id newFolder; NSArray *elements, *pathElements; - NSString *ocsPath, *objectPath, *login, *ocsName, *folderName; + NSString *path, *objectPath, *login, *ocsName, *folderName; elements = [reference componentsSeparatedByString: @":"]; login = [elements objectAtIndex: 0]; @@ -72,12 +72,11 @@ static NSString *defaultUserID = @""; else ocsName = @"personal"; - ocsPath = [NSString stringWithFormat: @"/Users/%@/%@/%@", - login, [pathElements objectAtIndex: 0], ocsName]; + path = [NSString stringWithFormat: @"/Users/%@/%@/%@", + login, [pathElements objectAtIndex: 0], ocsName]; folderName = [NSString stringWithFormat: @"%@_%@", login, ocsName]; - newFolder = [[self alloc] initWithName: folderName - inContainer: aContainer]; - [newFolder setOCSPath: ocsPath]; + newFolder = [self objectWithName: folderName inContainer: aContainer]; + [newFolder setOCSPath: path]; [newFolder setOwner: login]; return newFolder;