From efb4e99fec40f450addcc18a839dbcd3e1ba88a6 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 31 May 2012 16:25:31 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da Monotone-Revision: 743c613acf2129a221bf3026f94cba3d33fa64c8 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-05-31T16:25:31 --- ChangeLog | 4 ++++ UI/MailerUI/UIxMailMainFrame.m | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 83980e845..acee06ea5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 8db3cf656..e93e39ace 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -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];