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
This commit is contained in:
Ludovic Marcotte 2011-07-05 16:54:39 +00:00
parent 5b8c750f26
commit 3abac237a6
2 changed files with 6 additions and 3 deletions

View file

@ -10,6 +10,9 @@
owner. This fixes bug #1323 owner. This fixes bug #1323
* Added patches included in bug #1348 - which now allows * Added patches included in bug #1348 - which now allows
group-based ACLs for IMAP. 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 <lmarcotte@inverse.ca> 2011-07-02 Ludovic Marcotte <lmarcotte@inverse.ca>

View file

@ -94,7 +94,7 @@ static NSString *sieveScriptName = @"sogo";
[newLines addObject: line]; [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"]]; [newLines componentsJoinedByString: @"\n"]];
return newText; return newText;
@ -474,7 +474,7 @@ static NSString *sieveScriptName = @"sogo";
sieveAction = [NSString stringWithFormat: @"%@ %@", sieveAction = [NSString stringWithFormat: @"%@ %@",
method, [argument asSieveQuotedString]]; method, [argument asSieveQuotedString]];
else if ([method isEqualToString: @"reject"]) else if ([method isEqualToString: @"reject"])
sieveAction = [NSString stringWithFormat: @"%@ text: %@", sieveAction = [NSString stringWithFormat: @"%@ %@",
method, [argument asSieveQuotedString]]; method, [argument asSieveQuotedString]];
else else
scriptError scriptError