From 856c0f0fb06b85f5669cfd24e24665d7824a3e3a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sat, 15 Sep 2007 01:54:34 +0000 Subject: [PATCH] Monotone-Parent: c9d2f25bdcfea3f8f41656cea282a4a8b50b02be Monotone-Revision: a06ce5665fe20ccb682d88601d7ac8289b6491df Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-15T01:54:34 Monotone-Branch: ca.inverse.sogo --- UI/Common/UIxFolderActions.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/UI/Common/UIxFolderActions.m b/UI/Common/UIxFolderActions.m index 8aec0229e..943fbafe4 100644 --- a/UI/Common/UIxFolderActions.m +++ b/UI/Common/UIxFolderActions.m @@ -49,7 +49,7 @@ - (void) _setupContext { - NSString *clientClass, *mailInvitationParam; + NSString *folder, *mailInvitationParam; NSArray *realFolderPath; SOGoUser *activeUser; @@ -58,13 +58,7 @@ clientObject = [self clientObject]; owner = [clientObject ownerInContext: nil]; - clientClass = NSStringFromClass([clientObject class]); - if ([clientClass isEqualToString: @"SOGoContactGCSFolder"]) - baseFolder = @"Contacts"; - else if ([clientClass isEqualToString: @"SOGoAppointmentFolder"]) - baseFolder = @"Calendar"; - else - baseFolder = nil; + baseFolder = [[clientObject container] nameInContainer]; um = [LDAPUserManager sharedUserManager]; ud = [activeUser userSettings]; @@ -78,9 +72,12 @@ realFolderPath = [[clientObject nameInContainer] componentsSeparatedByString: @"_"]; + if ([realFolderPath count] > 1) + folder = [realFolderPath objectAtIndex: 1]; + else + folder = [realFolderPath objectAtIndex: 0]; subscriptionPointer = [NSString stringWithFormat: @"%@:%@/%@", - owner, baseFolder, - [realFolderPath objectAtIndex: 1]]; + owner, baseFolder, folder]; mailInvitationParam = [[context request] formValueForKey: @"mail-invitation"];