merge of '6446b9b2f85e41554b2841ae494d4cd03f7e3d0f'
and 'ecfd588ececc0cf909752cbf7561c097b6533867' Monotone-Parent: 6446b9b2f85e41554b2841ae494d4cd03f7e3d0f Monotone-Parent: ecfd588ececc0cf909752cbf7561c097b6533867 Monotone-Revision: 75fcb06d679aeaa2164c930b62aab2d44c31ff16 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-13T21:30:12 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
326fce5029
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2008-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
|
||||||
|
-contactInfosForUserWithUIDorEmail:uid]): only use the
|
||||||
|
authentication sources.
|
||||||
|
|
||||||
|
2008-08-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/Appointments/SOGoComponentOccurence.m
|
||||||
|
([SOGoComponentOccurence
|
||||||
|
+occurenceWithComponent:newComponentwithMasterComponent:newMasterinContainer:newContainer]):
|
||||||
|
seconds is now a NSTimeInterval instead of an int, to avoid
|
||||||
|
casting problems on the PowerPC architecture.
|
||||||
|
|
||||||
2008-08-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2008-08-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* UI/MailPartViewers/UIxMailPartICalViewer.m
|
* UI/MailPartViewers/UIxMailPartICalViewer.m
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
#import <SOGo/SOGoObject.h>
|
#import <SOGo/SOGoObject.h>
|
||||||
|
|
||||||
|
@class NSException;
|
||||||
|
|
||||||
@class iCalRepeatableEntityObject;
|
@class iCalRepeatableEntityObject;
|
||||||
@class SOGoCalendarComponent;
|
@class SOGoCalendarComponent;
|
||||||
|
|
||||||
|
@ -32,7 +34,7 @@
|
||||||
|
|
||||||
- (iCalRepeatableEntityObject *) occurence;
|
- (iCalRepeatableEntityObject *) occurence;
|
||||||
- (BOOL) isNew;
|
- (BOOL) isNew;
|
||||||
- (id) delete;
|
- (NSException *) delete;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#import <Foundation/NSArray.h>
|
#import <Foundation/NSArray.h>
|
||||||
|
#import <Foundation/NSCalendarDate.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
|
|
||||||
#import <NGCards/iCalCalendar.h>
|
#import <NGCards/iCalCalendar.h>
|
||||||
|
@ -42,7 +43,7 @@
|
||||||
inContainer: (SOGoCalendarComponent *) newContainer
|
inContainer: (SOGoCalendarComponent *) newContainer
|
||||||
{
|
{
|
||||||
SOGoComponentOccurence *occurence;
|
SOGoComponentOccurence *occurence;
|
||||||
unsigned int seconds;
|
NSTimeInterval seconds;
|
||||||
NSString *newName;
|
NSString *newName;
|
||||||
|
|
||||||
if (newComponent == newMaster)
|
if (newComponent == newMaster)
|
||||||
|
@ -50,8 +51,8 @@
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
seconds = [[newComponent recurrenceId] timeIntervalSince1970];
|
seconds = [[newComponent recurrenceId] timeIntervalSince1970];
|
||||||
newName = [NSString stringWithFormat: @"occurence%d", seconds];
|
newName = [NSString stringWithFormat: @"occurence%d", (int) seconds];
|
||||||
};
|
}
|
||||||
occurence = [self objectWithName: newName inContainer: newContainer];
|
occurence = [self objectWithName: newName inContainer: newContainer];
|
||||||
[occurence setComponent: newComponent];
|
[occurence setComponent: newComponent];
|
||||||
[occurence setMasterComponent: newMaster];
|
[occurence setMasterComponent: newMaster];
|
||||||
|
@ -134,7 +135,7 @@
|
||||||
return component;
|
return component;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id) delete
|
- (NSException *) delete;
|
||||||
{
|
{
|
||||||
NSException *error;
|
NSException *error;
|
||||||
iCalCalendar *parent;
|
iCalCalendar *parent;
|
||||||
|
@ -155,7 +156,7 @@
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) saveComponent: (id) newEvent
|
- (void) saveComponent: (iCalRepeatableEntityObject *) newEvent
|
||||||
{
|
{
|
||||||
[container saveComponent: newEvent];
|
[container saveComponent: newEvent];
|
||||||
}
|
}
|
||||||
|
|
|
@ -323,7 +323,7 @@ static BOOL forceImapLoginWithEmail = NO;
|
||||||
NSDictionary *userEntry;
|
NSDictionary *userEntry;
|
||||||
NSEnumerator *ldapSources;
|
NSEnumerator *ldapSources;
|
||||||
LDAPSource *currentSource;
|
LDAPSource *currentSource;
|
||||||
NSString *cn, *c_uid;
|
NSString *sourceID, *cn, *c_uid;
|
||||||
NSArray *c_emails;
|
NSArray *c_emails;
|
||||||
BOOL access;
|
BOOL access;
|
||||||
|
|
||||||
|
@ -336,9 +336,10 @@ static BOOL forceImapLoginWithEmail = NO;
|
||||||
[currentUser setObject: [NSNumber numberWithBool: YES]
|
[currentUser setObject: [NSNumber numberWithBool: YES]
|
||||||
forKey: @"MailAccess"];
|
forKey: @"MailAccess"];
|
||||||
|
|
||||||
ldapSources = [sources objectEnumerator];
|
ldapSources = [[self authenticationSourceIDs] objectEnumerator];
|
||||||
while ((currentSource = [ldapSources nextObject]))
|
while ((sourceID = [ldapSources nextObject]))
|
||||||
{
|
{
|
||||||
|
currentSource = [sources objectForKey: sourceID];
|
||||||
userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid];
|
userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid];
|
||||||
if (userEntry)
|
if (userEntry)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
#import <NGObjWeb/WOResponse.h>
|
#import <NGObjWeb/WOResponse.h>
|
||||||
|
|
||||||
|
#import <NGExtensions/NSNull+misc.h>
|
||||||
|
|
||||||
#import <GDLContentStore/GCSFolder.h>
|
#import <GDLContentStore/GCSFolder.h>
|
||||||
#import <GDLContentStore/GCSFolderManager.h>
|
#import <GDLContentStore/GCSFolderManager.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue