From 0ba59de88e48824f5ae8160e134429246d6a8049 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 9 Apr 2014 11:09:13 -0400
Subject: [PATCH] Fixed formatting/warnings in previous commit.

---
 UI/PreferencesUI/UIxPreferences.m | 51 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 94723a047..87059c608 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1232,7 +1232,7 @@ static NSArray *reminderValues = nil;
 
 - (BOOL) isSieveServerAvailable
 {
-  return (([[self sieveClient] isConnected])
+  return (([(NGSieveClient *)[self sieveClient] isConnected])
           ? true
           : false);
 }
@@ -1247,34 +1247,37 @@ static NSArray *reminderValues = nil;
   
   request = [context request];
   if ([[request method] isEqualToString: @"POST"])
-  {
-    dd = [[context activeUser] domainDefaults];
-    if ([dd sieveScriptsEnabled])
-      [userDefaults setSieveFilters: sieveFilters];
-    if ([dd vacationEnabled])
-      [userDefaults setVacationOptions: vacationOptions];
-    if ([dd forwardEnabled])
-      [userDefaults setForwardOptions: forwardOptions];
-    
-    if([self isSieveServerAvailable])
     {
-      [userDefaults synchronize];
-      folder = [[self clientObject] mailAccountsFolder: @"Mail"
-                                             inContext: context];
-      account = [folder lookupName: @"0" inContext: context acquire: NO];
+      dd = [[context activeUser] domainDefaults];
+      if ([dd sieveScriptsEnabled])
+        [userDefaults setSieveFilters: sieveFilters];
+      if ([dd vacationEnabled])
+        [userDefaults setVacationOptions: vacationOptions];
+      if ([dd forwardEnabled])
+        [userDefaults setForwardOptions: forwardOptions];
       
-      if([account updateFilters])
-        results = [self responseWithStatus: 200 andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
-      
-      else
-        results = [self responseWithStatus: 502 andJSONRepresentation:[NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
-    }
+      if ([self isSieveServerAvailable])
+        {
+          [userDefaults synchronize];
+          folder = [[self clientObject] mailAccountsFolder: @"Mail"
+                                                 inContext: context];
+          account = [folder lookupName: @"0" inContext: context acquire: NO];
+          
+          if ([account updateFilters])
+            results = [self responseWithStatus: 200
+                         andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
+          
+          else
+            results = [self responseWithStatus: 502
+                         andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
+        }
     else
-      results = [self responseWithStatus: 503 andJSONRepresentation:[NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
-  }
+      results = [self responseWithStatus: 503
+                   andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
+    }
   else
     results = self;
-  
+
   return results;
 }