aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-05-07 19:10:37 -0500
committerCharles Kerr <charles.kerr@canonical.com>2015-05-07 19:10:37 -0500
commita24c4f335c86c2d9bf97feb47471e6fe39e196d9 (patch)
tree5b3e6ae0062542e49a7fc2477ae99920861fc82b
parent4d94be8b6cce52862a401ed39bad9209c71f9a3e (diff)
downloadayatana-indicator-datetime-a24c4f335c86c2d9bf97feb47471e6fe39e196d9.tar.gz
ayatana-indicator-datetime-a24c4f335c86c2d9bf97feb47471e6fe39e196d9.tar.bz2
ayatana-indicator-datetime-a24c4f335c86c2d9bf97feb47471e6fe39e196d9.zip
in EngineEds' call to e_cal_util_generate_alarms_for_comp(), use nullptr as the default timezone so that we don't convert to local twice (once in _generate_alarms_for_comp, once in the DateTime ctor). Fixes the previous commit's failing test.
-rw-r--r--src/engine-eds.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index e1424d7..9c1f7c4 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -571,7 +571,7 @@ private:
const_cast<ECalComponentAlarmAction*>(omit.data()),
e_cal_client_resolve_tzid_cb,
subtask->client,
- subtask->default_timezone);
+ nullptr);
std::map<DateTime,Alarm> alarms;