See ChangeLog

Monotone-Parent: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da
Monotone-Revision: 743c613acf2129a221bf3026f94cba3d33fa64c8

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T16:25:31
maint-2.0.2
Ludovic Marcotte 2012-05-31 16:25:31 +00:00
parent ed67384586
commit efb4e99fec
2 changed files with 9 additions and 0 deletions

View File

@ -12,6 +12,10 @@
* 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.
* UI/MailerUI/UIxMailMainFrame.m (-unseenCountFolders): we no
longer fill up the list of mailboxes to with the ones that are
targets for "fileinto" methods if Sieve scripts aren't enabled
in SOGo's domain defaults.
2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>

View File

@ -639,6 +639,11 @@
NSString *s;
NSUInteger i, j, k;
// If Sieve scripts aren't enabled, there's no need in considering
// what's potentially in the database regarding "fileinto" scripts.
if (![[[context activeUser] domainDefaults] sieveScriptsEnabled])
return [[NSArray array] jsonRepresentation];
ud = [[context activeUser] userDefaults];
folders = [NSMutableArray array];