aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-02-05 16:52:57 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-02-05 16:52:57 -0600
commit4f27e42b0a517fac386042c67efc721463115bb9 (patch)
tree5783b4a75a101f2b64d34a952ae82b19211a6971 /src/main.cpp
parent5c91c53c1d56a356e091d6910b8c71e7c139f46a (diff)
downloadayatana-indicator-datetime-4f27e42b0a517fac386042c67efc721463115bb9.tar.gz
ayatana-indicator-datetime-4f27e42b0a517fac386042c67efc721463115bb9.tar.bz2
ayatana-indicator-datetime-4f27e42b0a517fac386042c67efc721463115bb9.zip
revert r400; we can't block alarms by UID because that would hide recurring alarms
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 3 insertions, 5 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())