From ec9d48c3a9160fbb4729c032d1f64fa83d5d0124 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 10 Mar 2014 10:53:44 -0400
Subject: [PATCH] Change the function name getClient to sieveClient

---
 UI/PreferencesUI/UIxPreferences.h |  2 +-
 UI/PreferencesUI/UIxPreferences.m | 21 ++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h
index e936e67b3..0dce259aa 100644
--- a/UI/PreferencesUI/UIxPreferences.h
+++ b/UI/PreferencesUI/UIxPreferences.h
@@ -64,7 +64,7 @@
 
 - (NSString *) userLongDateFormat;
 - (BOOL) isSieveServerAvailable;
-- (id) getClient;
+- (id) sieveClient;
 
 @end
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 474d7e888..eddd19f65 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -118,12 +118,7 @@ static NSArray *reminderValues = nil;
   if ((self = [super init]))
     {
       item = nil;
-<<<<<<< HEAD
       addressBooksIDWithDisplayName = nil;
-=======
-      client = [self getClient];
-      
->>>>>>> Added missing functions getClient and IsSieveServerConnected and the changes that comes with it
 #warning user should be the owner rather than the activeUser
       ASSIGN (user, [context activeUser]);
       ASSIGN (today, [NSCalendarDate date]);
@@ -184,11 +179,7 @@ static NSArray *reminderValues = nil;
   [contactsCategories release];
   [forwardOptions release];
   [daysOfWeek release];
-<<<<<<< HEAD
   [addressBooksIDWithDisplayName release];
-=======
-  [client release];
->>>>>>> Added missing functions getClient and IsSieveServerConnected and the changes that comes with it
   [super dealloc];
 }
 
@@ -1214,26 +1205,24 @@ static NSArray *reminderValues = nil;
     }
 }
 
-<<<<<<< HEAD
 - (NSString *) sogoVersion
 {
   // The variable SOGoVersion comes from the import: SOGo/Build.h
   return [NSString stringWithString: SOGoVersion];
 }
 
-=======
-- (id) getClient{
+- (id) sieveClient{
   SOGoMailAccount *account;
   SOGoMailAccounts *folder;
   SOGoSieveManager *manager;
-  NGSieveClient *realClient;
+  NGSieveClient *sieveClient;
   
   folder = [[self clientObject] mailAccountsFolder: @"Mail" inContext: context];
   account = [folder lookupName: @"0" inContext: context acquire: NO];
   manager = [SOGoSieveManager sieveManagerForUser: [context activeUser]];
-  realClient = [manager clientForAccount: account];
+  sieveClient = [manager clientForAccount: account];
   
-  return realClient;
+  return sieveClient;
 }
 
 - (BOOL) isSieveServerAvailable {
@@ -1242,8 +1231,6 @@ static NSArray *reminderValues = nil;
           : false);
 }
 
-
->>>>>>> Added missing functions getClient and IsSieveServerConnected and the changes that comes with it
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;