From 3abac237a672d08083cf2b44186c711f85f34a16 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 5 Jul 2011 16:54:39 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 48a1bab369727c086d0425d59fd2cf0ffc63b71c Monotone-Revision: d68444a3c794ab5baa8363ca087ec5caad13ba7b Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-07-05T16:54:39 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoSieveManager.m | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f7b688ac..52167d922 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ owner. This fixes bug #1323 * Added patches included in bug #1348 - which now allows group-based ACLs for IMAP. + * SoObjects/SOGo/SOGoSieveManager.m: Added patch from + bug #1344 - which fixes Sieve script generation errors + for reject filters. 2011-07-02 Ludovic Marcotte diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m index fc14c103d..62c91f980 100644 --- a/SoObjects/SOGo/SOGoSieveManager.m +++ b/SoObjects/SOGo/SOGoSieveManager.m @@ -94,7 +94,7 @@ static NSString *sieveScriptName = @"sogo"; [newLines addObject: line]; } - newText = [NSString stringWithFormat: @"\r\n%@\r\n.\r\n", + newText = [NSString stringWithFormat: @"text:\r\n%@\r\n.\r\n", [newLines componentsJoinedByString: @"\n"]]; return newText; @@ -474,8 +474,8 @@ static NSString *sieveScriptName = @"sogo"; sieveAction = [NSString stringWithFormat: @"%@ %@", method, [argument asSieveQuotedString]]; else if ([method isEqualToString: @"reject"]) - sieveAction = [NSString stringWithFormat: @"%@ text: %@", - method, [argument asSieveQuotedString]]; + sieveAction = [NSString stringWithFormat: @"%@ %@", + method, [argument asSieveQuotedString]]; else scriptError = [NSString stringWithFormat: @"Action has unknown method '%@'",