LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_16' (head b5d91e74f183ad54e2362119b25b4556f810e3b6) 

to branch 'ca.inverse.sogo' (head 1448263394a13cd5b07e5e7b96a8698dece9f745)

Monotone-Parent: 1448263394a13cd5b07e5e7b96a8698dece9f745
Monotone-Parent: b5d91e74f183ad54e2362119b25b4556f810e3b6
Monotone-Revision: 22fa8b6672b234c62ac60b3b99cae8134f58ed09

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T14:23:26
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2012-05-31 14:23:26 +00:00
parent a449fd3fae f2b455fffc
commit 20c9d86276
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@
of attributes to SOPE.
* Added patch from bug #1608. This add many more password
schemes for SQL authentication.
* SoObject/Mailer/SOGoMailFolder.m (_readMailboxACL): we
now create the mailbox if we are trying to read ACL of
a deleted mailbox.
2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>

11
SoObjects/Mailer/SOGoMailFolder.m
View File

@ -1216,6 +1216,17 @@ static NSString *defaultUserID = @"anyone";
[mailboxACL release];
mailboxACL = [[self imap4Connection] aclForMailboxAtURL: [self imap4URL]];
// 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]])
{
[[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [self imap4URL]]
atURL: [[self mailAccountFolder] imap4URL]];
mailboxACL = [[self imap4Connection] aclForMailboxAtURL: [self imap4URL]];
}
[mailboxACL retain];
[self _convertIMAPGroupnames];