aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/cal-util/timeutil.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 19da71dc32..57dbace88f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-15 Dan Winship <danw@helixcode.com>
+
+ * cal-util/timeutil.c (time_from_isodate): Fix the sign in the
+ HAVE_TM_GMTOFF case
+
2000-12-15 Federico Mena Quintero <federico@helixcode.com>
* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
index a718ed90f7..a2e1d7a38d 100644
--- a/calendar/cal-util/timeutil.c
+++ b/calendar/cal-util/timeutil.c
@@ -37,7 +37,7 @@ time_from_isodate (char *str)
if (str [15] == 'Z')
#if defined(HAVE_TM_GMTOFF)
- t -= my_tm.tm_gmtoff
+ t += my_tm.tm_gmtoff
#elif defined(HAVE_TIMEZONE)
t -= timezone
#endif