Monotone-Parent: 87a9edec020f812d113ea5bde21c2d30b040ab87

Monotone-Revision: c00d2fadae3d5733fb53c91e14b43a56d1e1ca58

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-11T19:55:13
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoUserFolder+Contacts.h

@@ -24,7 +24,6 @@
 #define SOGOUSERFOLDER_CONTACTS_H
 
 @class NSArray;
-@class NSString;
 
 #import <SOGo/SOGoUserFolder.h>
 

SoObjects/SOGo/SOGoGCSFolder.m

@@ -718,7 +718,7 @@ static NSArray *childRecordFields = nil;
 
   currentUser = [localContext activeUser];
 
-  if (delegatedUsers && [delegatedUsers count])
+  if ([delegatedUsers count])
     {
       if (![currentUser isSuperUser])
 	{

SoObjects/SOGo/SOGoUserFolder.m

@@ -129,7 +129,8 @@ static NSString *LDAPContactInfoAttribute = nil;
   for (count = 0; count < max; count++)
     {
       node = [children objectAtIndex: count];
-      componentName = [[(id<DOMElement>)node attribute: @"name"] lowercaseString];
+      componentName = [[(id<DOMElement>)node attribute: @"name"]
+                        lowercaseString];
       [filter setObject: [node textValue] forKey: componentName];
     }