From 40d2f1dfdd08650f5677be9713b0f95da88ad2c8 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Mon, 20 Sep 2010 17:18:37 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 733bf0f551fbe77a8e705d2645ef216b33ebdb1b Monotone-Revision: 174ea5c01f9f0634f1e2fad8b1483c6aed1d4f68 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-09-20T17:18:37 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/SOGo/SOGoGCSFolder.m | 14 ++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b07b01644..79b2dcea2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-09-20 Ludovic Marcotte + + * SoObjects/SOGo/SOGoGCSFolder.m + (+folderWithSubscriptionReference:inContainer:) + We now consider the localIsSubscription when + building the folderName + 2010-09-20 Francis Lachapelle * SoObjects/SOGo/SOGoContentObject.m (-davContentLength): use UTF8 diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index aba227d92..4343c9e46 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -172,13 +172,19 @@ static NSArray *childRecordFields = nil; path = [NSString stringWithFormat: @"/Users/%@/%@/%@", login, [pathElements objectAtIndex: 0], ocsName]; - folderName = [NSString stringWithFormat: @"%@_%@", - [login asCSSIdentifier], ocsName]; + + localIsSubscription = ![login isEqualToString: + [aContainer ownerInContext: localContext]]; + + if (localIsSubscription) + folderName = [NSString stringWithFormat: @"%@_%@", + [login asCSSIdentifier], ocsName]; + else + folderName = ocsName; + newFolder = [self objectWithName: folderName inContainer: aContainer]; [newFolder setOCSPath: path]; [newFolder setOwner: login]; - localIsSubscription = ![login isEqualToString: - [aContainer ownerInContext: localContext]]; [newFolder setIsSubscription: localIsSubscription]; if (![newFolder displayName]) newFolder = nil;