mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-17 14:24:52 +00:00
See ChangeLog.
Monotone-Parent: d11c3e99fe05eb716e0732c7b5c44019dcd75934 Monotone-Revision: 0a8cad3c6a768c445cd15f040d34f93bba3eb6ea Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-06-13T20:28:10 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -210,7 +210,7 @@
|
||||
NSCalendarDate *newStartDate, *now;
|
||||
NSTimeZone *timeZone;
|
||||
SOGoUserDefaults *ud;
|
||||
int hour;
|
||||
int hour, minute;
|
||||
unsigned int uStart, uEnd;
|
||||
|
||||
newStartDate = [self selectedDate];
|
||||
@@ -226,12 +226,15 @@
|
||||
{
|
||||
uEnd = [ud dayEndHour];
|
||||
hour = [now hourOfDay];
|
||||
minute = [now minuteOfHour];
|
||||
if (minute % 15)
|
||||
minute += 15 - (minute % 15);
|
||||
if (hour < uStart)
|
||||
newStartDate = [now hour: uStart minute: 0];
|
||||
else if (hour > uEnd)
|
||||
newStartDate = [[now tomorrow] hour: uStart minute: 0];
|
||||
else
|
||||
newStartDate = now;
|
||||
newStartDate = [now hour: [now hourOfDay] minute: minute];
|
||||
}
|
||||
else
|
||||
newStartDate = [newStartDate hour: uStart minute: 0];
|
||||
|
||||
Reference in New Issue
Block a user