Monotone-Parent: 9b0cbf04f17375b7cfda64246e43f61e206523e2

Monotone-Revision: 548f48d567bdb6d0f2f723558acdafb59a123dca

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-01-04T20:03:47
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2007-01-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-newStartDate]): fix the handling of the component start date
+	depending on the "hm" and the "day" parameters.
+
 	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
 	-roleOfUser:uidinContext:context]): set role of current user to
 	"Assistant" if the object that is accessed is "freebusy.ifb".

UI/Scheduler/UIxComponentEditor.m

@@ -604,7 +604,7 @@
     {
       now = [NSCalendarDate calendarDate];
       [now setTimeZone: [[self clientObject] userTimeZone]];
-      if (!([[now hour: 8 minute: 0] earlierDate: newStartDate] == newStartDate))
+      if ([now isDateOnSameDay: newStartDate])
         {
           hour = [now hourOfDay];
           if (hour < 8)
@@ -614,6 +614,8 @@
           else
             newStartDate = now;
         }
+      else
+        newStartDate = [newStartDate hour: 8 minute: 0];
     }
 
   return newStartDate;