added 'method' and 'userComment' functionality

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@763 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 123af1e1c8a4e34f846475c1e84d8da43ba676fc..8bf517c0b52c4d8ec4cb6059e85fcfff983e8971 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.60
+
+       * SOGoAppointment.[hm]: added 'method' and 'userComment' accessors
+
+       * SOGoAppointmentICalRenderer.m: properly render 'method' of
+         appointment if it's set - otherwise assume 'REQUEST'
+
 2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoUser.m: added -homeFolderInContext: and

diff --git a/SOGo/SoObjects/SOGo/SOGoAppointment.h b/SOGo/SoObjects/SOGo/SOGoAppointment.h
index 278f6e62b4c69714510302f22529543ba6639111..9afcf23a07f59ac34f278e180c7746946ad6c257 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoAppointment.h
+++ b/SOGo/SoObjects/SOGo/SOGoAppointment.h
@@ -58,6 +58,9 @@
 - (NSString *)comment;
 - (BOOL)hasComment;
 
+- (void)setUserComment:(NSString *)_userComment;
+- (NSString *)userComment;
+
 - (void)setPriority:(NSString *)_value;
 - (NSString *)priority;
 - (BOOL)hasPriority;
@@ -91,6 +94,9 @@
 - (NSString *)transparency;
 - (BOOL)isTransparent;
 
+- (void)setMethod:(NSString *)_method;
+- (NSString *)method;
+
 - (void)removeAllAttendees;
 - (void)addToAttendees:(iCalPerson *)_person;
 - (void)appendAttendees:(NSArray *)_persons;

diff --git a/SOGo/SoObjects/SOGo/SOGoAppointment.m b/SOGo/SoObjects/SOGo/SOGoAppointment.m
index 82bfe056fff0f0103280ee1a1003859000cf8eb7..335c6e7d1117217698237820bb54a272394df0fb 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoAppointment.m
+++ b/SOGo/SoObjects/SOGo/SOGoAppointment.m
@@ -179,6 +179,13 @@ static NGLogger                  *logger = nil;
   return YES;
 }
 
+- (void)setUserComment:(NSString *)_userComment {
+  [self->event setUserComment:_userComment];
+}
+- (NSString *)userComment {
+  return [self->event userComment];
+}
+
 - (void)setPriority:(NSString *)_value {
   [self->event setPriority:_value];
 }
@@ -290,6 +297,13 @@ static NGLogger                  *logger = nil;
   return [[self transparency] isEqualToString:@"TRANSPARENT"];
 }
 
+- (void)setMethod:(NSString *)_method {
+  [self->calendar setMethod:_method];
+}
+- (NSString *)method {
+  return [self->calendar method];
+}
+
 - (void)setOrganizer:(iCalPerson *)_organizer {
   [self->event setOrganizer:_organizer];
 }

diff --git a/SOGo/SoObjects/SOGo/SOGoAppointmentICalRenderer.m b/SOGo/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
index e377d05f0d3f2c7c1a3e0ff019db9e93b45bd41f..4c737f53e652c77f92b5e3ddfa4c2494499babc4 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
+++ b/SOGo/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
@@ -50,10 +50,17 @@ static unsigned DefaultICalStringCapacity = 1024;
   toString:(NSMutableString *)s
 {
   iCalCalendar *calendar;
+  NSString     *x;
 
   calendar = [_apt calendar];
   
-  [s appendString:@"BEGIN:VCALENDAR\r\nMETHOD:REQUEST\r\n"];
+  [s appendString:@"BEGIN:VCALENDAR\r\n"];
+  [s appendString:@"METHOD:"];
+  if((x = [calendar method]))
+    [s appendString:[x iCalSafeString]];
+  else
+    [s appendString:@"REQUEST"];
+  [s appendString:@"\r\n"];
   
   [s appendString:@"PRODID:"];
   [s appendString:[calendar isNotNull] ? [calendar prodId] : @"SOGo/0.9"];

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 8fefbc540ab7dc74029744d36b957839363d8f25..b072128a52d698f85aa6ffc9cd5329136555c7c7 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,7 +1,8 @@
 # version file
 
-SUBMINOR_VERSION:=59
+SUBMINOR_VERSION:=60
 
+# v0.9.60 requires libNGiCal          v4.5.49
 # v0.9.50 requires libGDLContentStore v4.5.30
 # v0.9.34 requires libGDLContentStore v4.5.26
 # v0.9.26 requires libOGoContentStore v0.9.13