diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/cal-util/timeutil.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8498890735..75ff2c9228 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2001-04-13 Dan Winship <danw@ximian.com> + + * cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon + here, and attempt to fix the logical bogon too. (tm_gmtoff and + timezone have opposite signs... I'm assuming Federico tested the + Linux case, so I'm flipping the sign of the BSD case. But maybe he + didn't and it's supposed to be the other way...) + 2001-04-12 Federico Mena Quintero <federico@ximian.com> * gui/e-day-view.c (update_query): New function to restart a query diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c index 2d769623aa..764ec5d078 100644 --- a/calendar/cal-util/timeutil.c +++ b/calendar/cal-util/timeutil.c @@ -97,8 +97,8 @@ time_from_isodate (const char *str) if (len == 16) { #if defined(HAVE_TM_GMTOFF) - t -= my_tm.tm_gmtoff; -#elsif defined(HAVE_TIMEZONE) + t += my_tm.tm_gmtoff; +#elif defined(HAVE_TIMEZONE) t -= timezone; #endif } |