From 068eb921aa473239b48115ef0abaac523ad28854 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 9 Apr 2014 10:48:47 -0400
Subject: [PATCH] rebase and fix comments made by extrafu

---
 SoObjects/SOGo/SOGoSieveManager.m | 2 +-
 UI/PreferencesUI/UIxPreferences.m | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m
index 765ad32d6..3254e70ce 100644
--- a/SoObjects/SOGo/SOGoSieveManager.m
+++ b/SoObjects/SOGo/SOGoSieveManager.m
@@ -755,7 +755,7 @@ static NSString *sieveScriptName = @"sogo";
     return nil;
   }
 
-  return client;
+  return [client autorelease];
 }
 
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index c5b86abb7..94723a047 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1219,12 +1219,12 @@ static NSArray *reminderValues = nil;
   SOGoMailAccounts *folder;
   SOGoSieveManager *manager;
   
-  if (client == nil)
+  if (!client)
   {
     folder = [[self clientObject] mailAccountsFolder: @"Mail" inContext: context];
     account = [folder lookupName: @"0" inContext: context acquire: NO];
     manager = [SOGoSieveManager sieveManagerForUser: [context activeUser]];
-    client = [manager clientForAccount: account];
+    client = [[manager clientForAccount: account] retain];
   }
   
   return client;