propagate from branch 'ca.inverse.sogo.1_3_16' (head fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da)
to branch 'ca.inverse.sogo' (head 22fa8b6672b234c62ac60b3b99cae8134f58ed09) Monotone-Parent: 22fa8b6672b234c62ac60b3b99cae8134f58ed09 Monotone-Parent: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da Monotone-Revision: 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-05-31T14:51:39 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
c55ad9363e
|
@ -6,9 +6,12 @@
|
|||
of attributes to SOPE.
|
||||
* Added patch from bug #1608. This add many more password
|
||||
schemes for SQL authentication.
|
||||
* SoObject/Mailer/SOGoMailFolder.m (_readMailboxACL): we
|
||||
* SoObject/Mailer/SOGoMailFolder.m (-_readMailboxACL): we
|
||||
now create the mailbox if we are trying to read ACL of
|
||||
a deleted mailbox.
|
||||
* UI/MailerUI/UIxMailEditor.m (-personalContactInfos): we check
|
||||
if the folder still exist and if the database isn't down
|
||||
before performing any address books search operations.
|
||||
|
||||
2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
|
|
|
@ -1220,7 +1220,7 @@ static NSString *defaultUserID = @"anyone";
|
|||
// If the mailbox doesn't exist, we create it. That could happen if
|
||||
// a special mailbox (Drafts, Sent, Trash) is deleted from SOGo's web GUI
|
||||
// or if any other mailbox is deleted behind SOGo's back.
|
||||
if ([mailboxACL isKindOf: [NSException class]])
|
||||
if ([mailboxACL isKindOfClass: [NSException class]])
|
||||
{
|
||||
[[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [self imap4URL]]
|
||||
atURL: [[self mailAccountFolder] imap4URL]];
|
||||
|
|
|
@ -422,8 +422,14 @@ static NSArray *infoKeys = nil;
|
|||
|
||||
folderContainer = (SOGoContactFolders *) [[[self clientObject] lookupUserFolder] privateContacts: @"Contacts"
|
||||
inContext: nil];
|
||||
|
||||
folder = [folderContainer lookupPersonalFolder: @"personal" ignoringRights: YES];
|
||||
|
||||
// If the folder doesn't exist anymore or if the database is down, we
|
||||
// return an empty array.
|
||||
if ([folder isKindOfClass: [NSException class]])
|
||||
return [NSArray array];
|
||||
|
||||
contactInfos = [folder lookupContactsWithFilter: nil
|
||||
onCriteria: nil
|
||||
sortBy: @"c_cn"
|
||||
|
|
Loading…
Reference in New Issue