From 7997448d416c12284e11a0038ae1ceed00a7cea2 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 9 Apr 2014 06:33:02 -0400
Subject: [PATCH] Fixed issus in previous commits

---
 SoObjects/Mailer/SOGoMailLabel.h  |  2 +-
 UI/PreferencesUI/UIxPreferences.m | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SoObjects/Mailer/SOGoMailLabel.h b/SoObjects/Mailer/SOGoMailLabel.h
index 54bd2496a..5a64f908d 100644
--- a/SoObjects/Mailer/SOGoMailLabel.h
+++ b/SoObjects/Mailer/SOGoMailLabel.h
@@ -25,7 +25,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSString.h>
 
-#import "../../UI/SOGoUI/UIxComponent.h";
+#import "../../UI/SOGoUI/UIxComponent.h"
 
 @interface SOGoMailLabel : NSObject
 {
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 0c59ffa02..9d9a35a5a 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -45,6 +45,7 @@
 #import <SOGo/SOGoSieveManager.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
+#import <SOGo/SOGoParentFolder.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 #import <SOGo/SOGoBuild.h>
 #import <Mailer/SOGoMailAccount.h>
@@ -694,7 +695,9 @@ static NSArray *reminderValues = nil;
 - (NSArray *) addressBookList
 {
   /* We want all the SourceIDS */
-  NSMutableArray *folders, *contactFolders, *availableAddressBooksID, *availableAddressBooksName;
+  NSMutableArray *folders, *availableAddressBooksID, *availableAddressBooksName;
+  SOGoParentFolder *contactFolders;
+
   int i, count;
   BOOL collectedAlreadyExist;
   
@@ -706,7 +709,7 @@ static NSArray *reminderValues = nil;
   count = [folders count]-1;
   
   // Inside this loop we remove all the public or shared addressbooks
-  for (count; count >= 0; count--)
+  for (; count >= 0; count--)
   {
     if (![[folders objectAtIndex: count] isKindOfClass: [SOGoContactGCSFolder class]])
       [folders removeObjectAtIndex: count];
@@ -716,14 +719,14 @@ static NSArray *reminderValues = nil;
   availableAddressBooksID = [NSMutableArray arrayWithCapacity: [folders count]];
   availableAddressBooksName = [NSMutableArray arrayWithCapacity: [folders count]];
   count = [folders count]-1;
-  collectedAlreadyExist = false;
+  collectedAlreadyExist = NO;
   
   for (i = 0; i <= count ; i++) {
     [availableAddressBooksID addObject:[[folders objectAtIndex:i] realNameInContainer]];
     [availableAddressBooksName addObject:[[folders objectAtIndex:i] displayName]];
     
     if ([[availableAddressBooksID objectAtIndex:i] isEqualToString: @"collected"])
-      collectedAlreadyExist = true;
+      collectedAlreadyExist = YES;
   }
   // Create the dictionary for the next function : itemAddressBookText.
   if (!addressBooksIDWithDisplayName)