aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-04-14 01:29:08 +0800
committerDan Winship <danw@src.gnome.org>2001-04-14 01:29:08 +0800
commit8870aff0a3691ddb58441187f292e712d3f47dc2 (patch)
treeaf44fb57e12b80cb2a27dfbc7b96d3ea28024900
parent045c3ffbeab912e8fb0eda1c455004c372ed3eee (diff)
downloadgsoc2013-evolution-8870aff0a3691ddb58441187f292e712d3f47dc2.tar.gz
gsoc2013-evolution-8870aff0a3691ddb58441187f292e712d3f47dc2.tar.zst
gsoc2013-evolution-8870aff0a3691ddb58441187f292e712d3f47dc2.zip
Fix the syntactic bogon here, and attempt to fix the logical bogon too.
* 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...) svn path=/trunk/; revision=9300
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/cal-util/timeutil.c4
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
}