From 55d696992dac8e8650d8d98b367e231e564212cd Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 14 Dec 2000 06:09:25 +0000 Subject: Use gmtime() unconditionally, since we want an UTC broken-down 2000-12-13 Federico Mena Quintero * src/libical/icaltime.c (icaltime_from_timet): Use gmtime() unconditionally, since we want an UTC broken-down representation. (icaltime_as_timet): Add the offset only if the time was supposed to be in UTC; that way mktime() will get a proper localtime as source data. svn path=/trunk/; revision=6996 --- libical/src/libical/icaltime.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libical/src') diff --git a/libical/src/libical/icaltime.c b/libical/src/libical/icaltime.c index 946a0115e9..4cdd3a9f0d 100644 --- a/libical/src/libical/icaltime.c +++ b/libical/src/libical/icaltime.c @@ -45,7 +45,7 @@ icaltime_from_timet(time_t tm, int is_date, int is_utc) } #endif - t = *(localtime(&tm)); + t = *(gmtime(&tm)); tt.second = t.tm_sec; tt.minute = t.tm_min; @@ -80,10 +80,9 @@ time_t icaltime_as_timet(struct icaltimetype tt) stm.tm_isdst = -1; /* prevents mktime from changing hour based on daylight savings */ - if(tt.is_utc == 0){ + if(tt.is_utc) stm.tm_sec -= icaltime_local_utc_offset(); - } - + tut = mktime(&stm); return tut; -- cgit v1.2.3