amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: eb31622ae90d2fb89289c5fd7f92a7a374d2a7ae

Browse Source 
Monotone-Revision: 29d76fd89f13195b427dd7ff6f09660b0abb56e6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-15T21:09:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-02-15 21:09:09 +00:00
parent 8f1f29b511
commit 5329f79aa4
6 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxAppointmentEditor.m
+1 -3
View File
@@ -264,11 +264,9 @@
{
iCalCalendar *calendar;
iCalEvent *appointment;
SOGoAppointmentObject *clientObject;
clientObject = [self clientObject];
calendar = [iCalCalendar parseSingleFromSource: _iCalString];
appointment = [clientObject firstEventFromCalendar: calendar];
appointment = (iCalEvent *) [calendar firstChildWithTag: @"vevent"];
return appointment;
}
UI/Scheduler/UIxAppointmentView.m
+6 -17
View File
@@ -162,25 +162,14 @@
- (iCalEvent *) appointment
{
NSString *iCalString;
iCalCalendar *calendar;
SOGoAppointmentObject *clientObject;
if (appointment != nil)
return appointment;
clientObject = [self clientObject];
iCalString = [[self clientObject] valueForKey:@"iCalString"];
if (![iCalString isNotNull] || [iCalString length] == 0) {
[self errorWithFormat:@"(%s): missing iCal string!",
__PRETTY_FUNCTION__];
return nil;
}
calendar = [iCalCalendar parseSingleFromSource: iCalString];
appointment = [clientObject firstEventFromCalendar: calendar];
[appointment retain];
if (!appointment)
{
clientObject = [self clientObject];
appointment = (iCalEvent *) [clientObject component];
[appointment retain];
}
return appointment;
}
UI/Scheduler/UIxCalView.m
+1 -1
View File
@@ -1,4 +1,4 @@
// $Id: UIxCalView.m 1021 2007-02-12 20:56:24Z wolfgang $
// $Id: UIxCalView.m 1022 2007-02-13 22:12:43Z wolfgang $
#import "common.h"
//#import <OGoContentStore/OCSFolder.h>
UI/Scheduler/UIxComponentEditor.m
+3 -13
View File
@@ -848,23 +848,13 @@
{
NSString *filename;
iCalEntityObject *calObject;
id co;
SOGoCalendarComponent *co;
if (componentLoaded)
{
co = [self clientObject];
if ([co isKindOfClass: [SOGoAppointmentObject class]])
{
calObject = (iCalEntityObject *) [co event];
filename = [self _toolbarForCalObject: calObject];
}
else if ([co isKindOfClass: [SOGoTaskObject class]])
{
calObject = (iCalEntityObject *) [co task];
filename = [self _toolbarForCalObject: calObject];
}
else
filename = @"";
calObject = [co component];
filename = [self _toolbarForCalObject: calObject];
}
else
filename = @"";
UI/Scheduler/UIxTaskEditor.m
+2 -4
View File
@@ -250,11 +250,9 @@
{
iCalCalendar *calendar;
iCalToDo *task;
SOGoTaskObject *clientObject;
clientObject = [self clientObject];
calendar = [iCalCalendar parseSingleFromSource: _iCalString];
task = [clientObject firstTaskFromCalendar: calendar];
task = (iCalToDo *) [calendar firstChildWithTag: @"vtodo"];
return task;
}
@@ -406,7 +404,7 @@
newStatus = [[self queryParameterForKey: @"status"] intValue];
taskObject = [self clientObject];
task = [taskObject task];
task = (iCalToDo *) [taskObject component];
switch (newStatus)
{
case 1:
UI/Scheduler/UIxTaskView.m
+6 -17
View File
@@ -162,25 +162,14 @@
- (iCalToDo *) task
{
NSString *iCalString;
iCalCalendar *calendar;
SOGoTaskObject *clientObject;
if (task != nil)
return task;
clientObject = [self clientObject];
iCalString = [[self clientObject] valueForKey:@"iCalString"];
if (![iCalString isNotNull] || [iCalString length] == 0) {
[self errorWithFormat:@"(%s): missing iCal string!",
__PRETTY_FUNCTION__];
return nil;
}
calendar = [iCalCalendar parseSingleFromSource: iCalString];
task = [clientObject firstTaskFromCalendar: calendar];
[task retain];
if (!task)
{
clientObject = [self clientObject];
task = (iCalToDo *) [clientObject component];
[task retain];
}
return task;
}