aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-01 10:42:53 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-01 10:42:53 +0100
commit789be70a666fe356fab15a643a173c647264db9b (patch)
tree8ef0e26d848b6c6ce0240ac521b62bc001fc89d5 /src/main.cpp
parent355cc4ad8d9131af41c53c5ea8ce682e199ded0f (diff)
parentede945145e96ecb3bde0dce0fd104c53f059cdca (diff)
downloadayatana-indicator-datetime-789be70a666fe356fab15a643a173c647264db9b.tar.gz
ayatana-indicator-datetime-789be70a666fe356fab15a643a173c647264db9b.tar.bz2
ayatana-indicator-datetime-789be70a666fe356fab15a643a173c647264db9b.zip
Merge branch 'tari01-pr/accountsservice-sound'
Attributes GH PR #70: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/70
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 279d7be..613f700 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,7 +32,7 @@
#include <datetime/planner-snooze.h>
#include <datetime/planner-range.h>
#include <datetime/settings-live.h>
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
#include <datetime/snap.h>
#endif
#include <datetime/state.h>
@@ -95,7 +95,7 @@ namespace
return state;
}
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
std::shared_ptr<AlarmQueue> create_simple_alarm_queue(const std::shared_ptr<Clock>& clock,
const std::shared_ptr<Planner>& snooze_planner,
const std::shared_ptr<Engine>& engine,
@@ -149,7 +149,7 @@ main(int /*argc*/, char** /*argv*/)
auto actions = std::make_shared<LiveActions>(state);
MenuFactory factory(actions, state);
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
// set up the snap decisions
auto snooze_planner = std::make_shared<SnoozePlanner>(state->settings, state->clock);
auto notification_engine = std::make_shared<ain::Engine>("ayatana-indicator-datetime-service");