amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-24 04:45:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 8b9a70c529140f9bb39dc1063631fc9e8cb5677f

Browse Source 
Monotone-Revision: d4b0b7bfea3f5d0389c4d53585ed513810a5dd8e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-29T22:05:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-29 22:05:16 +00:00
parent fa14b8d790
commit 8db342130d
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3
View File
@@ -1,5 +1,8 @@
2007-06-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
-folderIsMandatory]): returns NO unconditionnally.
* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
-appendPersonalSources]): add the "personal" folder to the list of
user folders even if it doesn't exist, so that it is created when
SoObjects/SOGo/SOGoUserFolder.m
+11 -8
View File
@@ -86,7 +86,7 @@
- (NSString *) ocsPath
{
return [@"/Users/" stringByAppendingString: [self login]];
return [NSString stringWithFormat: @"/Users/%@", nameInContainer];
}
- (NSString *) ocsUserPath
@@ -94,6 +94,11 @@
return [self ocsPath];
}
- (BOOL) folderIsMandatory
{
return NO;
}
- (NSString *) ocsPrivateCalendarPath
{
return [[self ocsUserPath] stringByAppendingString:@"/Calendar"];
@@ -163,13 +168,11 @@
obj = [super lookupName: _key inContext: _ctx acquire: NO];
if (!obj)
{
if ([_key hasPrefix: @"Calendar"])
{
obj = [self privateCalendar: @"Calendar" inContext: _ctx];
if (![_key isEqualToString: @"Calendar"])
obj = [obj lookupName: [_key pathExtension]
inContext: _ctx acquire: NO];
}
if ([_key isEqualToString: @"Calendar"])
obj = [self privateCalendar: @"Calendar" inContext: _ctx];
// if (![_key isEqualToString: @"Calendar"])
// obj = [obj lookupName: [_key pathExtension]
// inContext: _ctx acquire: NO];
else if ([_key isEqualToString: @"Contacts"])
obj = [self privateContacts: _key inContext: _ctx];
// else if ([_key isEqualToString: @"Groups"])