From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 14 Jul 2005 18:00:46 +0000 (+0000)
Subject: added 'method' and 'userComment' functionality
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f5e9422b0ebedbb778e3033b211b74843a5e4a;p=scalable-opengroupware.org

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 123af1e1..8bf517c0 100644
--- 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 278f6e62..9afcf23a 100644
--- 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 82bfe056..335c6e7d 100644
--- 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 e377d05f..4c737f53 100644
--- 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 8fefbc54..b072128a 100644
--- 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