Monotone-Parent: 2b628a62ac49757d2bbeda1275fc38d69079752a

Monotone-Revision: 59d4ff7e6c2fe24e74adbe4891af30ece4f5e858

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-14T03:26:50
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m

@@ -27,10 +27,12 @@
 #import <Foundation/NSTimeZone.h>
 
 #import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
 #import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalRecurrenceCalculator.h>
 #import <NGCards/iCalTimeZone.h>
 #import <NGCards/NSString+NGCards.h>
+#import <NGCards/NSDictionary+NGCards.h>
 #import <NGExtensions/NGCalendarDateRange.h>
 
 #import "iCalRepeatableEntityObject+SOGo.h"
@@ -40,10 +42,12 @@
 - (NSArray *) _indexedRules: (NSArray *) rules
 {
   NSMutableArray *ma;
-  unsigned int i, count;
-  NSString *valuesString;
+  NSUInteger i, count;
+  NSMutableString *ruleString;
   iCalRecurrenceRule *rule;
 
+#warning we could return an NSArray instead and feed it as such to the iCalRecurrenceRule in SOGoAppointmentFolder...
+
   ma = nil;
 
   count = [rules count];
@@ -53,9 +57,11 @@
       for (i = 0; i < count; i++)
 	{
 	  rule = [rules objectAtIndex:i];
-#warning we could return an NSArray instead and feed it as such to the iCalRecurrenceRule in SOGoAppointmentFolder...
-	  valuesString = [[rule values] componentsJoinedByString: @";"];
-	  [ma addObject: valuesString];
+          ruleString = [NSMutableString new];
+          [[rule values] versitRenderInString: ruleString
+                                 asAttributes: NO];
+	  [ma addObject: ruleString];
+          [ruleString release];
 	}
     }
 
@@ -138,7 +144,7 @@
       else
 	{
 	  startDate = theOccurenceDate;
-	  if ([self isAllDay])
+	  if ([self isKindOfClass: [iCalEvent class]] && [(iCalEvent *) self isAllDay])
 	    {
 	      // The event lasts all-day and has no timezone (floating); we convert the range of the first event
 	      // to the occurence's timezone.