revert r400; we can't block alarms by UID because that would hide recurring alarms

2 files changed, 6 insertions, 24 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 2be727f..31d9db6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,17 +59,15 @@ main(int /*argc*/, char** /*argv*/)
     state->settings = live_settings;
     state->clock = live_clock;
     state->locations.reset(new SettingsLocations(live_settings, live_timezones));
-    std::shared_ptr<PlannerEds> eds_planner(new PlannerEds(live_clock));
-    eds_planner->time = live_clock->localtime();
-    state->planner = eds_planner;
+    state->planner.reset(new PlannerEds(live_clock));
+    state->planner->time = live_clock->localtime();
     std::shared_ptr<Actions> actions(new LiveActions(state));
     MenuFactory factory(actions, state);
 
     // snap decisions
     ClockWatcherImpl clock_watcher(state);
     Snap snap;
-    clock_watcher.alarm_reached().connect([&snap,&eds_planner](const Appointment& appt){
-        eds_planner->block_appointment(appt); // when we show a snap decision, take it out of the menu
+    clock_watcher.alarm_reached().connect([&snap](const Appointment& appt){
         auto snap_show = [](const Appointment& a){
             const char* url;
             if(!a.url.empty())
diff --git a/src/planner-eds.cpp b/src/planner-eds.cpp
index e9452f0..7d9416c 100644
--- a/src/planner-eds.cpp
+++ b/src/planner-eds.cpp
@@ -77,12 +77,6 @@ public:
         g_clear_object(&m_source_registry);
     }
 
-    void block_appointment(const Appointment& appointment)
-    {
-        m_blocked.insert(appointment.uid);
-        rebuild_soon(UPCOMING);
-    }
-
 private:
 
     static void on_source_registry_ready(GObject* /*source*/, GAsyncResult* res, gpointer gself)
@@ -354,13 +348,9 @@ private:
         const auto begin = g_date_time_add_minutes(ref.get(),-10);
         const auto end = g_date_time_add_months(begin,1);
 
-        get_appointments(begin, end, [this](const std::vector<Appointment>& all) {
-            std::vector<Appointment> unblocked;
-            for(const auto& a : all)
-                if (m_blocked.count(a.uid) == 0)
-                    unblocked.push_back(a);
-            g_debug("got %d upcoming appointments, %d of which are unblocked", (int)all.size(), (int)unblocked.size());
-            m_owner.upcoming.set(unblocked);
+        get_appointments(begin, end, [this](const std::vector<Appointment>& appointments) {
+            g_debug("got %d upcoming appointments", (int)appointments.size());
+            m_owner.upcoming.set(appointments);
         });
 
         g_date_time_unref(end);
@@ -530,7 +520,6 @@ private:
     std::set<ESource*> m_sources;
     std::map<ESource*,ECalClient*> m_clients;
     std::map<ESource*,ECalClientView*> m_views;
-    std::set<std::string> m_blocked;
     GCancellable* m_cancellable = nullptr;
     ESourceRegistry* m_source_registry = nullptr;
     guint m_rebuild_tag = 0;
@@ -542,11 +531,6 @@ PlannerEds::PlannerEds(const std::shared_ptr<Clock>& clock): p(new Impl(*this, c
 
 PlannerEds::~PlannerEds() =default;
 
-void PlannerEds::block_appointment(const Appointment& appointment)
-{
-    p->block_appointment(appointment);
-}
-
 } // namespace datetime
 } // namespace indicator
 } // namespace unity