LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
maint-2.0.2
Wolfgang Sourdeau 2008-08-12 18:58:46 +00:00
parent 68f08f55c8 180f6bbef8
commit ced39ae72d
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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>
* UI/MailPartViewers/UIxMailPartICalViewer.m

4
SoObjects/Appointments/SOGoComponentOccurence.h
View File

@ -25,6 +25,8 @@
#import <SOGo/SOGoObject.h>
@class NSException;
@class iCalRepeatableEntityObject;
@class SOGoCalendarComponent;
@ -32,7 +34,7 @@
- (iCalRepeatableEntityObject *) occurence;
- (BOOL) isNew;
- (id) delete;
- (NSException *) delete;
@end

11
SoObjects/Appointments/SOGoComponentOccurence.m
View File

@ -21,6 +21,7 @@
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSString.h>
#import <NGCards/iCalCalendar.h>
@ -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];
}