build warnings

Monotone-Parent: 45249fe68411e1b5ecd968fb87f91801d6882115
Monotone-Revision: 9ea936d2bbff9184d4e2df3779bdc267702b6996

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-22T16:33:35
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.h

@@ -82,6 +82,12 @@ typedef enum {
 - (NSString *) resourceNameForEventUID: (NSString *) _uid;
 
 /* fetching */
+- (NSArray *) bareFetchFields: (NSArray *) fields
+                         from: (NSCalendarDate *) startDate
+                           to: (NSCalendarDate *) endDate 
+                        title: (NSString *) title
+                    component: (NSString *) component
+            additionalFilters: (NSString *) filters;
 
 - (NSArray *)    fetchFields: (NSArray *) _fields
 			from: (NSCalendarDate *) _startDate

SoObjects/Appointments/SOGoAppointmentFolders.m

@@ -55,6 +55,8 @@
 @interface SOGoParentFolder (Private)
 
 - (NSException *) initSubscribedSubFolders;
+- (NSException *) _fetchPersonalFolders: (NSString *) sql
+                            withChannel: (EOAdaptorChannel *) fc;
 
 @end
 
@@ -265,8 +267,7 @@
                                    attributes: nil]];
       componentSet
         = [davElementWithContent (@"supported-calendar-component-set",
-                                  XMLNS_CALDAV,
+                                  XMLNS_CALDAV, components)
-                                  components)
                                  asWebDAVValue];
       [componentSet retain];
     }
@@ -284,7 +285,6 @@
 
   us = [[SOGoUser userWithLogin: [self ownerInContext: nil]]
 	 userSettings];
- 
   tmp = [us objectForKey: @"Calendar"];
   if (tmp)
     {
@@ -312,7 +312,6 @@
 
   isWebRequest = [[context request] handledByDefaultHandler];
   error = [super _fetchPersonalFolders: sql withChannel: fc];
-
   if (!error)
     {
       webCalendarIds = [self webCalendarIds];
@@ -449,26 +448,20 @@
   static NSArray *readAccessRoles = nil;
  
   if (!writeAccessRoles)
-    {
+    writeAccessRoles = [[NSArray alloc] initWithObjects:
-      writeAccessRoles = [NSArray arrayWithObjects:
+                                          SOGoCalendarRole_ConfidentialModifier,
-                                    SOGoCalendarRole_ConfidentialModifier,
+                                        SOGoRole_ObjectCreator,
-                                  SOGoRole_ObjectCreator,
+                                        SOGoRole_ObjectEraser,
-                                  SOGoRole_ObjectEraser,
+                                        SOGoCalendarRole_PrivateModifier,
-                                  SOGoCalendarRole_PrivateModifier,
+                                        SOGoCalendarRole_PublicModifier,
-                                  SOGoCalendarRole_PublicModifier,
+                                        nil];
-                                  nil];
-      [writeAccessRoles retain];
-    }
  
   if (!readAccessRoles)
-    {
+    readAccessRoles = [[NSArray alloc] initWithObjects:
-      readAccessRoles = [NSArray arrayWithObjects:
+                                         SOGoCalendarRole_ConfidentialViewer,
-                                   SOGoCalendarRole_ConfidentialViewer,
+                                       SOGoCalendarRole_PrivateViewer,
-                                 SOGoCalendarRole_PrivateViewer,
+                                       SOGoCalendarRole_PublicViewer,
-                                 SOGoCalendarRole_PublicViewer,
+                                       nil];
-                                 nil];
-      [readAccessRoles retain];
-    }
 
   return (hasWriteAccess) ? writeAccessRoles : readAccessRoles;
 }

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -1462,9 +1462,11 @@
     }
 }
 
-- (void) prepareDelete
+- (NSException *) prepareDelete
 {
   [self prepareDeleteOccurence: nil];
+
+  return nil;
 }
 
 /* message type */

SoObjects/Appointments/SOGoComponentOccurence.h

@@ -35,8 +35,11 @@
 @protocol SOGoComponentOccurence
 
 - (iCalRepeatableEntityObject *) occurence;
+- (void) setIsNew: (BOOL) newIsNew;
 - (BOOL) isNew;
-- (NSException *) prepareDelete;
+
+- (NSException *) changeParticipationStatus: (NSString *) newPartStat
+                               withDelegate: (iCalPerson *) delegate;
 
 @end
 
@@ -54,10 +57,6 @@
 
 - (void) setComponent: (iCalRepeatableEntityObject *) newComponent;
 - (void) setMasterComponent: (iCalRepeatableEntityObject *) newMaster;
-- (void) setIsNew: (BOOL) newIsNew;
-
-- (NSException *) changeParticipationStatus: (NSString *) newPartStat
-                               withDelegate: (iCalPerson *) delegate;
 
 @end
 

SoObjects/Contacts/SOGoContactLDIFEntry.h

@@ -43,6 +43,8 @@
       withLDIFEntry: (NSDictionary *) newEntry
         inContainer: (id) newContainer;
 
+- (NSString *) davEntityTag;
+
 @end
 
 #endif /* SOGOCONTACTLDIFENTRY_H */

SoObjects/Contacts/SOGoContactObject.h

@@ -39,13 +39,9 @@
 
 @protocol SOGoContactObject
 
-- (NSString *) contentAsString;
 - (NGVCard *) vCard;
 - (void) save;
 
-- (NSString *) davEntityTag;
-- (NSString *) nameInContainer;
-
 @end
 
 #endif /* __Contacts_SOGoContactObject_H__ */

SoObjects/Mailer/SOGoDraftObject.m

@@ -77,6 +77,14 @@ static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc",
 				 @"from", @"replyTo", @"message-id",
 				 nil};
 
+#warning -[NGImap4Connection postData:flags:toFolderURL:] should be enhanced \
+  to return at least the new uid
+@interface NGImap4Connection (SOGoHiddenMethods)
+
+- (NSString *) imap4FolderNameForURL: (NSURL *) url;
+
+@end
+
 @implementation SOGoDraftObject
 
 static NGMimeType  *MultiMixedType = nil;

SoObjects/SOGo/SOGoContentObject.h

@@ -29,6 +29,7 @@
 @class NSException;
 @class NSString;
 @class SOGoGCSFolder;
+@class WOContext;
 
 @interface SOGoContentObject : SOGoObject
 {
@@ -60,6 +61,8 @@
                         baseVersion: (unsigned int) _baseVersion;
 - (NSException *) saveContentString: (NSString *)_str;
 
+- (id) PUTAction: (WOContext *) _ctx;
+
 /* actions */
 - (NSException *) copyToFolder: (SOGoGCSFolder *) newFolder;
 - (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder;
@@ -80,7 +83,7 @@
 
 @interface SOGoContentObject (OptionalMethods)
 
-- (void) prepareDelete;
+- (NSException *) prepareDelete;
 
 @end
 

UI/Contacts/UIxContactFoldersView.m

@@ -177,7 +177,7 @@
 - (id <WOActionResults>) allContactSearchAction
 {
   id <WOActionResults> result;
-  id <SOGoContactFolder> folder;
+  SOGoFolder <SOGoContactFolder> *folder;
   NSString *searchText, *mail;
   NSDictionary *data;
   NSArray *folders, *contacts, *descriptors, *sortedContacts;

UI/MailerUI/UIxMailEditor.m

@@ -26,7 +26,10 @@
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoSubContext.h>
+#define COMPILING_NGOBJWEB 1 /* we want httpRequest for parsing multi-part
+                                form data */
 #import <NGObjWeb/WORequest.h>
+#undef COMPILING_NGOBJWEB
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -498,12 +501,12 @@ static NSArray *infoKeys = nil;
   // TODO: need to validate whether we have a To etc
   
   /* first, save form data */
-  result = [self validateForSend];
+  result = (id <WOActionResults>) [self validateForSend];
   if (!result)
     {
       if ([self _saveFormInfo])
 	{
-	  result = [[self clientObject] sendMail];
+	  result = (id <WOActionResults>) [[self clientObject] sendMail];
 	  if (!result)
 	    result = [self jsCloseWithRefreshMethod: @"refreshCurrentFolder()"];
 	}

UI/SOGoElements/SOGoIEConditional.m

@@ -31,7 +31,10 @@
        associations: (NSDictionary *) associations
 	   template: (WOElement *) newTemplate
 {
-  ASSIGN (template, newTemplate);
+  if ((self = [super initWithName: name
+                     associations: associations
+                         template: newTemplate]))
+    ASSIGN (template, newTemplate);
 
   return self;
 }

UI/SOGoUI/SOGoACLAdvisory.m

@@ -37,6 +37,15 @@
 
 #import "SOGoACLAdvisory.h"
 
+/* those methods appear here because SOGoMailFolder is not a descendant of
+   SOGoFolder... */
+@interface SOGoObject (SOGoFolderACLMethods)
+
+- (NSString *) displayName;
+- (NSString *) folderType;
+
+@end
+
 @implementation SOGoACLAdvisory
 
 - (id) init

UI/SOGoUI/UIxComponent.m

@@ -365,16 +365,6 @@ static NSMutableArray *abbrMonthLabelKeys = nil;
   return [[currentClient baseURLInContext: context] hostlessURL];
 }
 
-- (NSString *) resourcesPath
-{
-  WOResourceManager *rm;
-
-  if ((rm = [self resourceManager]) == nil)
-    rm = [[WOApplication application] resourceManager];
-
-  return [rm webServerResourcesPath];
-}
-
 - (NSString *) ownPath
 {
   NSString *uri;

UI/Scheduler/UIxAppointmentEditor.m

@@ -324,7 +324,7 @@
                          onObject: co
                         inContext: context])
         method = [NSString stringWithFormat:@"%@/%@.ics/editAsAppointment",
-                           [co soURL], objectId];
+                           [co soURL], objectId] ;
       else
         method = [NSString stringWithFormat: @"%@/Calendar/personal/%@.ics/editAsAppointment",
                            [self userFolderPath], objectId];