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

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

Browse source 
to branch 'ca.inverse.sogo' (head 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec)

Monotone-Parent: 45eb5c274b8f92ec62e79ca295ad0a74f02f89ec
Monotone-Parent: 743c613acf2129a221bf3026f94cba3d33fa64c8
Monotone-Revision: cb0fdb8e1df2644d8f633779e64cca48f332bbf6

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T16:26:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2012-05-31 16:26:11 +00:00
parent c55ad9363e efb4e99fec
commit 9234f5edd0
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -12,6 +12,10 @@
* UI/MailerUI/UIxMailEditor.m (-personalContactInfos): we check * UI/MailerUI/UIxMailEditor.m (-personalContactInfos): we check
if the folder still exist and if the database isn't down if the folder still exist and if the database isn't down
before performing any address books search operations. 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> 2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>

5
UI/MailerUI/UIxMailMainFrame.m
View file

@ -639,6 +639,11 @@
NSString *s; NSString *s;
NSUInteger i, j, k; 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]; ud = [[context activeUser] userDefaults];
folders = [NSMutableArray array]; folders = [NSMutableArray array];