merge of '498058170a280ae890f83fe6a844882a2e050746'
and '66f5bf2b1f0082b3e316b8859f467f9d93b22cda' Monotone-Parent: 498058170a280ae890f83fe6a844882a2e050746 Monotone-Parent: 66f5bf2b1f0082b3e316b8859f467f9d93b22cda Monotone-Revision: 365602b463a8b9735fa4920922f94dd73b3481e4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-12T18:58:46 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
ced39ae72d
|
@ -1,3 +1,11 @@
|
||||||
|
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];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue