diff -Nru indicator-datetime-13.10.0+15.10.20150720/debian/changelog indicator-datetime-13.10.0+15.10.20150722/debian/changelog --- indicator-datetime-13.10.0+15.10.20150720/debian/changelog 2015-07-22 12:11:17.000000000 +0000 +++ indicator-datetime-13.10.0+15.10.20150722/debian/changelog 2015-07-22 12:11:17.000000000 +0000 @@ -1,12 +1,14 @@ -indicator-datetime (13.10.0+15.10.20150720-0ubuntu1) wily; urgency=medium +indicator-datetime (13.10.0+15.10.20150722-0ubuntu1) wily; urgency=medium - [ Iain Lane ] - * Update for e-d-s 3.16 + * - [ Robert Ancell ] - * Update for e-d-s 3.16 + -- CI Train Bot Wed, 22 Jul 2015 12:03:51 +0000 - -- CI Train Bot Mon, 20 Jul 2015 16:48:52 +0000 +indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium + + * New rebuild forced. + + -- CI Train Bot Fri, 10 Jul 2015 20:35:47 +0000 indicator-datetime (13.10.0+15.10.20150624-0ubuntu1) wily; urgency=medium @@ -31,6 +33,13 @@ -- CI Train Bot Fri, 15 May 2015 16:41:41 +0000 +indicator-datetime (13.10.0+15.04.20150618-0ubuntu1) vivid; urgency=medium + + [ Charles Kerr ] + * Fix invalid valarms in older clock-app alarms. (LP: #1465806) + + -- CI Train Bot Thu, 18 Jun 2015 19:25:41 +0000 + indicator-datetime (13.10.0+15.04.20150406-0ubuntu1) vivid; urgency=medium [ Charles Kerr ] diff -Nru indicator-datetime-13.10.0+15.10.20150720/src/engine-eds.cpp indicator-datetime-13.10.0+15.10.20150722/src/engine-eds.cpp --- indicator-datetime-13.10.0+15.10.20150720/src/engine-eds.cpp 2015-07-20 16:48:49.000000000 +0000 +++ indicator-datetime-13.10.0+15.10.20150722/src/engine-eds.cpp 2015-07-22 12:03:49.000000000 +0000 @@ -47,16 +47,21 @@ { public: - Impl(): - m_cancellable(g_cancellable_new()) + Impl() { - e_source_registry_new(m_cancellable, on_source_registry_ready, this); + auto cancellable_deleter = [](GCancellable * c) { + g_cancellable_cancel(c); + g_clear_object(&c); + }; + + m_cancellable = std::shared_ptr(g_cancellable_new(), cancellable_deleter); + + e_source_registry_new(m_cancellable.get(), on_source_registry_ready, this); } ~Impl() { - g_cancellable_cancel(m_cancellable); - g_clear_object(&m_cancellable); + m_cancellable.reset(); while(!m_sources.empty()) remove_source(*m_sources.begin()); @@ -131,9 +136,9 @@ e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_alarm_component_list_ready, - new ClientSubtask(main_task, client, color)); + new ClientSubtask(main_task, client, m_cancellable, color)); g_clear_pointer(&sexp, g_free); // ask EDS about events that occur in this window... @@ -142,9 +147,9 @@ e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_event_component_list_ready, - new ClientSubtask(main_task, client, color)); + new ClientSubtask(main_task, client, m_cancellable, color)); g_clear_pointer(&sexp, g_free); g_clear_pointer(&sexp_fmt, g_free); @@ -160,7 +165,7 @@ e_cal_client_get_object(kv.second, appointment.uid.c_str(), nullptr, - m_cancellable, + m_cancellable.get(), on_object_ready_for_disable, this); } @@ -272,7 +277,7 @@ e_cal_client_connect(source, source_type, -1, - self->m_cancellable, + self->m_cancellable.get(), on_client_connected, gself); } @@ -307,7 +312,7 @@ // now create a view for it so that we can listen for changes e_cal_client_get_view (ecc, "#t", // match all - self->m_cancellable, + self->m_cancellable.get(), on_client_view_ready, self); @@ -430,7 +435,7 @@ e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), ensure_client_alarms_have_triggers_async_cb, this); @@ -511,7 +516,7 @@ e_cal_client_modify_objects(client, modify_slist, E_CAL_OBJ_MOD_ALL, - m_cancellable, + m_cancellable.get(), ensure_canonical_alarms_have_triggers_async_cb, this); @@ -581,13 +586,16 @@ { std::shared_ptr task; ECalClient* client; + std::shared_ptr cancellable; std::string color; ClientSubtask(const std::shared_ptr& task_in, ECalClient* client_in, + const std::shared_ptr& cancellable_in, const char* color_in): task(task_in), - client(client_in) + client(client_in), + cancellable(cancellable_in) { if (color_in) color = color_in; @@ -721,15 +729,44 @@ } static DateTime - datetime_from_component_date_time(const ECalComponentDateTime & in, - GTimeZone * default_timezone) + datetime_from_component_date_time(ECalClient * client, + std::shared_ptr & cancellable, + const ECalComponentDateTime & in, + GTimeZone * default_timezone) { DateTime out; - g_return_val_if_fail(in.value != nullptr, out); - auto gtz = in.tzid == nullptr ? g_time_zone_ref(default_timezone) - : g_time_zone_new(in.tzid); + GTimeZone * gtz {}; + if (in.tzid != nullptr) + { + auto itz = icaltimezone_get_builtin_timezone_from_tzid(in.tzid); // usually works + + if (itz == nullptr) // fallback + itz = icaltimezone_get_builtin_timezone(in.tzid); + + if (itz == nullptr) // ok we have a strange tzid... ask EDS to look it up in VTIMEZONES + e_cal_client_get_timezone_sync(client, in.tzid, &itz, cancellable.get(), nullptr); + + const char * tzid; + if (itz != nullptr) + { + tzid = icaltimezone_get_location(itz); + } + else + { + g_warning("Unrecognized TZID: '%s'", in.tzid); + tzid = nullptr; + } + + gtz = g_time_zone_new(tzid); + g_debug("%s eccdt.tzid -> offset is %d", G_STRLOC, in.tzid, (int)g_time_zone_get_offset(gtz,0)); + } + else + { + gtz = g_time_zone_ref(default_timezone); + } + out = DateTime(gtz, in.value->year, in.value->month, @@ -774,7 +811,10 @@ } static Appointment - get_appointment(ECalComponent * component, GTimeZone * gtz) + get_appointment(ECalClient * client, + std::shared_ptr & cancellable, + ECalComponent * component, + GTimeZone * gtz) { Appointment baseline; @@ -793,13 +833,13 @@ // get appointment.begin ECalComponentDateTime eccdt_tmp {}; e_cal_component_get_dtstart(component, &eccdt_tmp); - baseline.begin = datetime_from_component_date_time(eccdt_tmp, gtz); + baseline.begin = datetime_from_component_date_time(client, cancellable, eccdt_tmp, gtz); e_cal_component_free_datetime(&eccdt_tmp); // get appointment.end e_cal_component_get_dtend(component, &eccdt_tmp); baseline.end = eccdt_tmp.value != nullptr - ? datetime_from_component_date_time(eccdt_tmp, gtz) + ? datetime_from_component_date_time(client, cancellable, eccdt_tmp, gtz) : baseline.begin; e_cal_component_free_datetime(&eccdt_tmp); @@ -840,7 +880,7 @@ ClientSubtask * subtask, GTimeZone * gtz) { - // events with alarms are covered by add_alarm_to_subtask(), + // events with alarms are covered by add_alarms_to_subtask(), // so skip them here auto auids = e_cal_component_get_alarm_uids(component); const bool has_alarms = auids != nullptr; @@ -851,7 +891,7 @@ // add it. simple, eh? if (is_component_interesting(component)) { - Appointment appointment = get_appointment(component, gtz); + Appointment appointment = get_appointment(subtask->client, subtask->cancellable, component, gtz); appointment.color = subtask->color; subtask->task->appointments.push_back(appointment); } @@ -867,7 +907,7 @@ if (!is_component_interesting(component)) return; - Appointment baseline = get_appointment(component, gtz); + Appointment baseline = get_appointment(subtask->client, subtask->cancellable, component, gtz); baseline.color = subtask->color; /** @@ -959,7 +999,7 @@ e_cal_client_modify_object(E_CAL_CLIENT(client), e_cal_component_get_icalcomponent(ecc), E_CAL_OBJ_MOD_THIS, - static_cast(gself)->m_cancellable, + static_cast(gself)->m_cancellable.get(), on_disable_done, nullptr); @@ -991,7 +1031,7 @@ std::set m_sources; std::map m_clients; std::map m_views; - GCancellable* m_cancellable {}; + std::shared_ptr m_cancellable; ESourceRegistry* m_source_registry {}; guint m_rebuild_tag {}; time_t m_rebuild_deadline {}; diff -Nru indicator-datetime-13.10.0+15.10.20150720/tests/CMakeLists.txt indicator-datetime-13.10.0+15.10.20150722/tests/CMakeLists.txt --- indicator-datetime-13.10.0+15.10.20150720/tests/CMakeLists.txt 2015-07-20 16:48:43.000000000 +0000 +++ indicator-datetime-13.10.0+15.10.20150722/tests/CMakeLists.txt 2015-07-22 12:03:49.000000000 +0000 @@ -88,6 +88,8 @@ add_eds_ics_test_by_name(test-eds-ics-nonrepeating-events) add_eds_ics_test_by_name(test-eds-ics-repeating-valarms) add_eds_ics_test_by_name(test-eds-ics-missing-trigger) +add_eds_ics_test_by_name(test-eds-ics-tzids) +add_eds_ics_test_by_name(test-eds-ics-tzids-2) # disabling the timezone unit tests because they require diff -Nru indicator-datetime-13.10.0+15.10.20150720/tests/test-eds-ics-tzids-2.cpp indicator-datetime-13.10.0+15.10.20150722/tests/test-eds-ics-tzids-2.cpp --- indicator-datetime-13.10.0+15.10.20150720/tests/test-eds-ics-tzids-2.cpp 1970-01-01 00:00:00.000000000 +0000 +++ indicator-datetime-13.10.0+15.10.20150722/tests/test-eds-ics-tzids-2.cpp 2015-07-22 12:03:49.000000000 +0000 @@ -0,0 +1,88 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include +#include +#include + +#include + +#include "glib-fixture.h" +#include "print-to.h" +#include "timezone-mock.h" +#include "wakeup-timer-mock.h" + +using namespace unity::indicator::datetime; +using VAlarmFixture = GlibFixture; + +/*** +**** +***/ + +TEST_F(VAlarmFixture, MultipleAppointments) +{ + // start the EDS engine + auto engine = std::make_shared(); + + // we need a consistent timezone for the planner and our local DateTimes + constexpr char const * zone_str {"America/Los_Angeles"}; + auto tz = std::make_shared(zone_str); + auto gtz = g_time_zone_new(zone_str); + + // make a planner that looks at the first half of 2015 in EDS + auto planner = std::make_shared(engine, tz); + const DateTime range_begin {gtz, 2006,1, 1, 0, 0, 0.0}; + const DateTime range_end {gtz, 2015,12,31,23,59,59.5}; + planner->range().set(std::make_pair(range_begin, range_end)); + + // give EDS a moment to load + if (planner->appointments().get().empty()) { + g_message("waiting a moment for EDS to load..."); + auto on_appointments_changed = [this](const std::vector& appointments){ + g_message("ah, they loaded"); + if (!appointments.empty()) + g_main_loop_quit(loop); + }; + core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed)); + constexpr int max_wait_sec = 10; + wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND); + } + + // what we expect to get... + std::array expected_appts; + auto appt = &expected_appts[0]; + appt->uid = "109264742"; + appt->color = "#becedd"; + appt->summary = "National Incubator Initiative for Clean Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar"; + appt->begin = DateTime{gtz,2014,1,21,11,0,0}; + appt->end = DateTime{gtz,2014,1,21,13,0,0}; + appt->alarms = std::vector{ Alarm({"Reminder", "", DateTime(gtz,2014,1,21,10,45,0)}) }; + + // compare it to what we actually loaded... + const auto appts = planner->appointments().get(); + EXPECT_EQ(expected_appts.size(), appts.size()); + for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i. + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include +#include +#include + +#include + +#include "glib-fixture.h" +#include "print-to.h" +#include "timezone-mock.h" +#include "wakeup-timer-mock.h" + +using namespace unity::indicator::datetime; +using VAlarmFixture = GlibFixture; + +/*** +**** +***/ + +TEST_F(VAlarmFixture, MultipleAppointments) +{ + // start the EDS engine + auto engine = std::make_shared(); + + // we need a consistent timezone for the planner and our local DateTimes + constexpr char const * zone_str {"Europe/Berlin"}; + auto tz = std::make_shared(zone_str); + auto gtz = g_time_zone_new(zone_str); + + // make a planner that looks at the first half of 2015 in EDS + auto planner = std::make_shared(engine, tz); + const DateTime range_begin {gtz, 2015,7, 1, 0, 0, 0.0}; + const DateTime range_end {gtz, 2015,7,31,23,59,59.5}; + planner->range().set(std::make_pair(range_begin, range_end)); + + // give EDS a moment to load + if (planner->appointments().get().empty()) { + g_message("waiting a moment for EDS to load..."); + auto on_appointments_changed = [this](const std::vector& appointments){ + g_message("ah, they loaded"); + if (!appointments.empty()) + g_main_loop_quit(loop); + }; + core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed)); + constexpr int max_wait_sec = 10; + wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND); + } + + // what we expect to get... + std::array expected_appts; + auto appt = &expected_appts[0]; + appt->uid = "8ggc30kh89qql8vjumgtug7l14@google.com"; + appt->color = "#becedd"; + appt->summary = "Hello"; + appt->begin = DateTime{gtz,2015,7,1,20,0,0}; + appt->end = DateTime{gtz,2015,7,1,22,0,0}; + + // compare it to what we actually loaded... + const auto appts = planner->appointments().get(); + EXPECT_EQ(expected_appts.size(), appts.size()); + for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i