See ChangeLog.

Monotone-Parent: 633c912a165a7258c1aa8a70d0816daff59274e1
Monotone-Revision: de7e6a583e1acc600d976efeef72db979312bb94

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-28T02:22:51

ChangeLog

@@ -1,3 +1,9 @@
+2012-07-31  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/SOGo/SOGoSieveManager.m
+	(-sieveScriptWithRequirements:): filters must not be conditional
+	to each other.
+
 2012-07-25  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailFolder.m

SoObjects/SOGo/SOGoSieveManager.m

@@ -563,7 +563,6 @@ static NSString *sieveScriptName = @"sogo";
   NSString *sieveText;
   NSArray *scripts;
   int count, max;
-  BOOL previousWasConditional;
   NSDictionary *currentScript;
 
   sieveScript = [NSMutableString stringWithCapacity: 8192];
@@ -576,22 +575,12 @@ static NSString *sieveScriptName = @"sogo";
   max = [scripts count];
   if (max)
     {
-      previousWasConditional = NO;
       for (count = 0; !scriptError && count < max; count++)
         {
           currentScript = [scripts objectAtIndex: count];
           if ([[currentScript objectForKey: @"active"] boolValue])
             {
               sieveText = [self _convertScriptToSieve: currentScript];
-              if ([sieveText hasPrefix: @"if"])
-                {
-                  if (previousWasConditional)
-                    [sieveScript appendFormat: @"els"];
-                  else
-                    previousWasConditional = YES;
-                }
-              else
-                previousWasConditional = NO;
               [sieveScript appendString: sieveText];
             }
         }