From 81904fb8964b086b0dead0a29c2b49db7a321742 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 11 Aug 2008 19:21:56 +0000 Subject: [PATCH 1/3] Monotone-Parent: eacf14246d4dde8712de638d29d8a7cdc77fac45 Monotone-Revision: a225193926236b0f6640bace3c33305ab1184832 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-11T19:21:56 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ SoObjects/Appointments/SOGoComponentOccurence.h | 4 +++- SoObjects/Appointments/SOGoComponentOccurence.m | 11 ++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d00304c2..75e6f0ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-11 Wolfgang Sourdeau + + * 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 * UI/MailPartViewers/UIxMailPartICalViewer.m diff --git a/SoObjects/Appointments/SOGoComponentOccurence.h b/SoObjects/Appointments/SOGoComponentOccurence.h index f511e673c..24854a578 100644 --- a/SoObjects/Appointments/SOGoComponentOccurence.h +++ b/SoObjects/Appointments/SOGoComponentOccurence.h @@ -25,6 +25,8 @@ #import +@class NSException; + @class iCalRepeatableEntityObject; @class SOGoCalendarComponent; @@ -32,7 +34,7 @@ - (iCalRepeatableEntityObject *) occurence; - (BOOL) isNew; -- (id) delete; +- (NSException *) delete; @end diff --git a/SoObjects/Appointments/SOGoComponentOccurence.m b/SoObjects/Appointments/SOGoComponentOccurence.m index 244b2a0b4..539eb0285 100644 --- a/SoObjects/Appointments/SOGoComponentOccurence.m +++ b/SoObjects/Appointments/SOGoComponentOccurence.m @@ -21,6 +21,7 @@ */ #import +#import #import #import @@ -42,7 +43,7 @@ inContainer: (SOGoCalendarComponent *) newContainer { SOGoComponentOccurence *occurence; - unsigned int seconds; + NSTimeInterval seconds; NSString *newName; if (newComponent == newMaster) @@ -50,8 +51,8 @@ else { seconds = [[newComponent recurrenceId] timeIntervalSince1970]; - newName = [NSString stringWithFormat: @"occurence%d", seconds]; - }; + newName = [NSString stringWithFormat: @"occurence%d", (int) seconds]; + } occurence = [self objectWithName: newName inContainer: newContainer]; [occurence setComponent: newComponent]; [occurence setMasterComponent: newMaster]; @@ -134,7 +135,7 @@ return component; } -- (id) delete +- (NSException *) delete; { NSException *error; iCalCalendar *parent; @@ -155,7 +156,7 @@ return error; } -- (void) saveComponent: (id) newEvent +- (void) saveComponent: (iCalRepeatableEntityObject *) newEvent { [container saveComponent: newEvent]; } From 844abebcd6d5c736c8e44a84cc5b57ac71b71c2c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Aug 2008 21:29:18 +0000 Subject: [PATCH 2/3] Monotone-Parent: 365602b463a8b9735fa4920922f94dd73b3481e4 Monotone-Revision: 3320a2f057d89877bbdad688f91b973ad939e531 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-13T21:29:18 Monotone-Branch: ca.inverse.sogo --- UI/Contacts/UIxContactFoldersView.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index 429c3729f..73255c762 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -33,6 +33,8 @@ #import #import +#import + #import #import From 0e52813fc15d44b0f8e486de058b53ba38602e6e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Aug 2008 21:29:49 +0000 Subject: [PATCH 3/3] Monotone-Parent: 3320a2f057d89877bbdad688f91b973ad939e531 Monotone-Revision: ecfd588ececc0cf909752cbf7561c097b6533867 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-13T21:29:49 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/LDAPUserManager.m | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75e6f0ec3..de4830570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-13 Wolfgang Sourdeau + + * SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager + -contactInfosForUserWithUIDorEmail:uid]): only use the + authentication sources. + 2008-08-11 Wolfgang Sourdeau * SoObjects/Appointments/SOGoComponentOccurence.m diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m index e19cce700..3679e0f67 100644 --- a/SoObjects/SOGo/LDAPUserManager.m +++ b/SoObjects/SOGo/LDAPUserManager.m @@ -323,7 +323,7 @@ static BOOL forceImapLoginWithEmail = NO; NSDictionary *userEntry; NSEnumerator *ldapSources; LDAPSource *currentSource; - NSString *cn, *c_uid; + NSString *sourceID, *cn, *c_uid; NSArray *c_emails; BOOL access; @@ -336,9 +336,10 @@ static BOOL forceImapLoginWithEmail = NO; [currentUser setObject: [NSNumber numberWithBool: YES] forKey: @"MailAccess"]; - ldapSources = [sources objectEnumerator]; - while ((currentSource = [ldapSources nextObject])) + ldapSources = [[self authenticationSourceIDs] objectEnumerator]; + while ((sourceID = [ldapSources nextObject])) { + currentSource = [sources objectForKey: sourceID]; userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid]; if (userEntry) {