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

merge of 'c0c3fcc36b231d74c76f51c0827795b0ac360f7c'

Browse source 
and 'ef4d1dca45f5b9bbb2bd53d9f0116baab9367c9d'

Monotone-Parent: c0c3fcc36b231d74c76f51c0827795b0ac360f7c
Monotone-Parent: ef4d1dca45f5b9bbb2bd53d9f0116baab9367c9d
Monotone-Revision: 929c48879342ae7a0903a90d5d51d42a4913acb0

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-22T15:17:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert 2009-07-22 15:17:48 +00:00
parent 81d6757af5 9540d475b9
commit 9ce6b68cec
2 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-07-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoUserFolder+Appointments.m
(-davCalendarScheduleInboxURL, -davCalendarScheduleOutboxURL)
(-davDropboxHomeURL, -davNotificationsURL): proxied methods to a
common accessor.
2009-07-21 Cyril Robert <crobert@inverse.ca>
* UI/Scheduler/UIxCalendarProperties.m: Prevent doing anything when not

59
SoObjects/Appointments/SOGoUserFolder+Appointments.m
View file

@ -91,56 +91,37 @@
return [NSArray arrayWithObject: tag];
}
- (NSArray *) _davPersonalCalendarURL
{
NSArray *tag;
SOGoAppointmentFolders *parent;
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
nil];
return [NSArray arrayWithObject: tag];
}
- (NSArray *) davCalendarScheduleInboxURL
{
NSArray *tag;
SOGoAppointmentFolders *parent;
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
nil];
return [NSArray arrayWithObject: tag];
return [self _davPersonalCalendarURL];
}
- (NSString *) davCalendarScheduleOutboxURL
- (NSArray *) davCalendarScheduleOutboxURL
{
NSArray *tag;
SOGoAppointmentFolders *parent;
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
nil];
return [NSArray arrayWithObject: tag];
return [self _davPersonalCalendarURL];
}
- (NSString *) davDropboxHomeURL
- (NSArray *) davDropboxHomeURL
{
NSArray *tag;
SOGoAppointmentFolders *parent;
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
nil];
return [NSArray arrayWithObject: tag];
return [self _davPersonalCalendarURL];
}
- (NSString *) davNotificationsURL
- (NSArray *) davNotificationsURL
{
NSArray *tag;
SOGoAppointmentFolders *parent;
parent = [self privateCalendars: @"Calendar" inContext: context];
tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
[NSString stringWithFormat: @"%@personal/", [[parent davURL] path]],
nil];
return [NSArray arrayWithObject: tag];
return [self _davPersonalCalendarURL];
}
- (WOResponse *) _prepareResponseFromContext: (WOContext *) queryContext