Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make calIDateTime properties like hour to be in the given timezone

Browse Source 
bug 280971, r=vlad
(plus off-by-one fix for weekday)
This commit is contained in:
mvl%exedo.nl 2005-02-04 20:42:08 +00:00
parent 78fd3f2b78
commit a08d398d35
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/base/src/calDateTime.cpp
View File

@ -278,6 +278,7 @@ calDateTime::GetInTimezone(const char *aTimezone, calIDateTime **aResult)
* assign, since this item is floating */
if (icalt.zone) {
icaltimezone_convert_time(&icalt, (icaltimezone*) icalt.zone, destzone);
icalt.zone = destzone;
} else {
icalt.zone = destzone;
}
@ -383,12 +384,6 @@ calDateTime::FromIcalTime(icaltimetype *icalt)
{
icaltimetype t = *icalt;
// if we get a time in a specific timezone,
// convert it to UTC.
if (!t.is_utc && t.zone) {
t = icaltime_convert_to_zone(*icalt, icaltimezone_get_utc_timezone());
}
mYear = t.year;
mMonth = t.month - 1;
mDay = t.day;
@ -396,11 +391,13 @@ calDateTime::FromIcalTime(icaltimetype *icalt)
mMinute = t.minute;
mSecond = t.second;
mIsUtc = t.is_utc ? PR_TRUE : PR_FALSE;
mIsUtc = (t.zone == icaltimezone_get_utc_timezone());
mIsDate = t.is_date ? PR_TRUE : PR_FALSE;
mTimezone.Assign(icaltimezone_get_tzid((icaltimezone*)t.zone));
// reconstruct nativetime
time_t tt = icaltime_as_timet(*icalt);
time_t tt = icaltime_as_timet_with_zone(*icalt, icaltimezone_get_utc_timezone());
PRInt64 temp, million;
LL_I2L(million, PR_USEC_PER_SEC);
LL_I2L(temp, tt);
@ -408,7 +405,7 @@ calDateTime::FromIcalTime(icaltimetype *icalt)
mNativeTime = temp;
// reconstruct weekday/yearday
mWeekday = icaltime_day_of_week(*icalt);
mWeekday = icaltime_day_of_week(*icalt) - 1;
mYearday = icaltime_day_of_year(*icalt);
}