merge of '08c3123324ab89795cc2faa5f26bd5427cd30786'

and 'be94621e6c7d7ae0610925c213a0fc8f46eb30e9'

Monotone-Parent: 08c3123324ab89795cc2faa5f26bd5427cd30786
Monotone-Parent: be94621e6c7d7ae0610925c213a0fc8f46eb30e9
Monotone-Revision: 7d16f254344611b08352a256acdce727a91c6718

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-31T04:10:26
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -37,6 +37,13 @@
 	-defaultAction]): idem.
 	([UIxAppointmentEditor -viewAction]): idem. 
 
+2008-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
+	-eventsBlocksAction]): fixed a crash occuring in the rare
+	situation where an event end date would be inferior than its start
+	date.
+
 2008-12-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.{h,m}

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -431,7 +431,7 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
 	  [currentComponent removeAllExceptionDates];
 	  for (count = 0; count < max; count++)
 	    [currentComponent addToExceptionDates: [newDates objectAtIndex: count]];
-	}      
+	}
     }
 }
 

UI/Scheduler/UIxCalListingActions.m

@@ -371,8 +371,14 @@ static inline void
 _feedBlockWithDayBasedData(NSMutableDictionary *block, unsigned int start,
 			   unsigned int end, unsigned int dayStart)
 {
-  unsigned int delta, quarterStart, length;
-
+  unsigned int delta, quarterStart, length, swap;
+  
+  if (start > end)
+    {
+      swap = end;
+      end = start;
+      start = swap;
+    }
   quarterStart = (start - dayStart) / quarterLength;
   delta = end - dayStart;
   if ((delta % quarterLength))