propagate from branch 'ca.inverse.sogo.1_3_10' (head a96cbe44e3664528e8b96cf10301c6a34afdd80e)

to branch 'ca.inverse.sogo' (head a7c71d116cd3e44573b0f929774cb879c253f577)

Monotone-Parent: a7c71d116cd3e44573b0f929774cb879c253f577
Monotone-Parent: a96cbe44e3664528e8b96cf10301c6a34afdd80e
Monotone-Revision: bbb8c6d413d58aed3320b954f516c9ab2d0b0329

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-30T15:11:12
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolders.m

@@ -634,11 +634,8 @@ static SoSecurityManager *sm = nil;
 {
   SOGoAppointmentFolder *currentFolder;
   NSArray *subFolderNames, *proxyRoles;
-  NSMutableArray *subscribers;
   int folderCount, folderMax, userCount, userMax;
 
-  subscribers = [NSMutableArray array];
-
   proxyRoles = [self _requiredProxyRolesWithWriteAccess: write];
   subFolderNames = [self subFolders];
   folderMax = [subFolderNames count];
@@ -664,11 +661,8 @@ static SoSecurityManager *sm = nil;
 {
   SOGoAppointmentFolder *currentFolder;
   NSArray *subFolderNames;
-  NSMutableArray *subscribers;
   int folderCount, folderMax, userCount, userMax;
 
-  subscribers = [NSMutableArray array];
-
   subFolderNames = [self subFolders];
   folderMax = [subFolderNames count];
   for (folderCount = 0; folderCount < folderMax; folderCount++)

SoObjects/Appointments/SOGoUserFolder+Appointments.m

@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
+#import <Foundation/NSNull.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>

SoObjects/SOGo/SOGoUserFolder.m

@@ -22,7 +22,6 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
-#import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>