Monotone-Parent: a4b72920f072cccd72e189b05519b57436eb9471

Monotone-Revision: 71372fb23c7baec6da2c9bd612ed5a65db22f208

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-21T14:35:58
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -69,7 +69,7 @@
 #import <SOGo/WORequest+SOGo.h>
 #import <SOGo/WOResponse+SOGo.h>
 
-#import "iCalEntityObject+SOGo.h"
+#import "iCalRepeatableEntityObject+SOGo.h"
 #import "iCalPerson+SOGo.h"
 #import "SOGoAppointmentObject.h"
 #import "SOGoAppointmentFolders.h"

SoObjects/Appointments/SOGoAppointmentInboxFolder.m

@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSString.h>
 #import <SaxObjC/XMLNamespaces.h>

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -24,6 +24,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
+#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>

SoObjects/Appointments/SOGoAptMailReceipt.m

@@ -34,6 +34,7 @@
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 
 #import "SOGoAptMailReceipt.h"
 

SoObjects/Appointments/SOGoWebAppointmentFolder.m

@@ -25,6 +25,7 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoUserSettings.h>
 
 #import "SOGoWebAppointmentFolder.h"
 

SoObjects/Contacts/SOGoUserFolder+Contacts.m

@@ -32,12 +32,14 @@
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/NSString+DAV.h>
 
+#import "SOGoContactFolders.h"
+
 #import "SOGoUserFolder+Contacts.h"
 
 @interface SOGoUserFolder (private)
 
-- (SOGoAppointmentFolders *) privateContacts: (NSString *) key
-				   inContext: (WOContext *) localContext;
+- (SOGoContactFolders *) privateContacts: (NSString *) key
+                               inContext: (WOContext *) localContext;
 
 @end
 
@@ -47,7 +49,7 @@
 - (NSArray *) davAddressbookHomeSet
 {
   NSArray *tag;
-  SOGoAppointmentFolders *parent;
+  SOGoContactFolders *parent;
 
   parent = [self privateContacts: @"Contacts" inContext: context];
   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",

SoObjects/Mailer/SOGoMailFolder.m

@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>

SoObjects/Mailer/SOGoMailForward.m

@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSString+misc.h>
 
@@ -89,7 +91,8 @@
   NSString *rc;
 
   if (htmlComposition)
-    rc = [[[sourceMail mailHeaders] objectForKey: @"from"] stringByEscapingHTMLString];
+    rc = [[[sourceMail mailHeaders] objectForKey: @"from"]
+           stringByEscapingHTMLString];
   else
     rc = [[sourceMail mailHeaders] objectForKey: @"from"];
 

SoObjects/Mailer/SOGoMailObject.m

@@ -30,6 +30,7 @@
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NGHashMap.h>

SoObjects/Mailer/SOGoSieveConverter.m

@@ -429,6 +429,8 @@ static NSDictionary *methodRequirements = nil;
     *flag, *mailbox;
   SOGoDomainDefaults *dd;
 
+  sieveAction = nil;
+
   method = [action objectForKey: @"method"];
   if (method)
     {
@@ -484,10 +486,7 @@ static NSDictionary *methodRequirements = nil;
         }
     }
   else
-    {
-      scriptError = @"Action missing 'method' parameter";
-      sieveAction = nil;
-    }
+    scriptError = @"Action missing 'method' parameter";
 
   return sieveAction;
 }

SoObjects/SOGo/SOGoCASSession.h

@@ -46,7 +46,7 @@
                   andParameters: (NSDictionary *) parameters;
 
 + (SOGoCASSession *) CASSessionWithTicket: (NSString *) newTicket;
-+ (SOGoCASSession *) CASSessionWithIdentifier: (NSString *) identifier;
++ (SOGoCASSession *) CASSessionWithIdentifier: (NSString *) newIdentifier;
 
 - (NSString *) identifier;
 

SoObjects/SOGo/SOGoCASSession.m

@@ -83,14 +83,14 @@
   return newSession;
 }
 
-+ (SOGoCASSession *) CASSessionWithIdentifier: (NSString *) identifier
++ (SOGoCASSession *) CASSessionWithIdentifier: (NSString *) newIdentifier
 {
   SOGoCASSession *session;
   SOGoCache *cache;
   NSString *casTicket;
 
   cache = [SOGoCache sharedCache];
-  casTicket = [cache CASTicketFromIdentifier: identifier];
+  casTicket = [cache CASTicketFromIdentifier: newIdentifier];
   session = [self CASSessionWithTicket: casTicket];
 
   return session;

SoObjects/SOGo/WOContext+SOGo.m

@@ -27,8 +27,9 @@
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOSession.h>
 
-#import <SOGoUser.h>
-#import <SOGoUserDefaults.h>
+#import "SOGoDomainDefaults.h"
+#import "SOGoUser.h"
+#import "SOGoUserDefaults.h"
 
 #import "WOContext+SOGo.h"