build warnings
Monotone-Parent: 45249fe68411e1b5ecd968fb87f91801d6882115 Monotone-Revision: 9ea936d2bbff9184d4e2df3779bdc267702b6996 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-22T16:33:35 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
2df89a88ca
commit
1e5155e1a2
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
components)
|
||||
XMLNS_CALDAV, 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 arrayWithObjects:
|
||||
writeAccessRoles = [[NSArray alloc] initWithObjects:
|
||||
SOGoCalendarRole_ConfidentialModifier,
|
||||
SOGoRole_ObjectCreator,
|
||||
SOGoRole_ObjectEraser,
|
||||
SOGoCalendarRole_PrivateModifier,
|
||||
SOGoCalendarRole_PublicModifier,
|
||||
nil];
|
||||
[writeAccessRoles retain];
|
||||
}
|
||||
|
||||
if (!readAccessRoles)
|
||||
{
|
||||
readAccessRoles = [NSArray arrayWithObjects:
|
||||
readAccessRoles = [[NSArray alloc] initWithObjects:
|
||||
SOGoCalendarRole_ConfidentialViewer,
|
||||
SOGoCalendarRole_PrivateViewer,
|
||||
SOGoCalendarRole_PublicViewer,
|
||||
nil];
|
||||
[readAccessRoles retain];
|
||||
}
|
||||
|
||||
return (hasWriteAccess) ? writeAccessRoles : readAccessRoles;
|
||||
}
|
||||
|
|
|
@ -1462,9 +1462,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (void) prepareDelete
|
||||
- (NSException *) prepareDelete
|
||||
{
|
||||
[self prepareDeleteOccurence: nil];
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
/* message type */
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
withLDIFEntry: (NSDictionary *) newEntry
|
||||
inContainer: (id) newContainer;
|
||||
|
||||
- (NSString *) davEntityTag;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* SOGOCONTACTLDIFENTRY_H */
|
||||
|
|
|
@ -39,13 +39,9 @@
|
|||
|
||||
@protocol SOGoContactObject
|
||||
|
||||
- (NSString *) contentAsString;
|
||||
- (NGVCard *) vCard;
|
||||
- (void) save;
|
||||
|
||||
- (NSString *) davEntityTag;
|
||||
- (NSString *) nameInContainer;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* __Contacts_SOGoContactObject_H__ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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()"];
|
||||
}
|
||||
|
|
|
@ -31,6 +31,9 @@
|
|||
associations: (NSDictionary *) associations
|
||||
template: (WOElement *) newTemplate
|
||||
{
|
||||
if ((self = [super initWithName: name
|
||||
associations: associations
|
||||
template: newTemplate]))
|
||||
ASSIGN (template, newTemplate);
|
||||
|
||||
return self;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue