diff options
author | Robert Tari <robert@tari.in> | 2021-11-24 09:58:10 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-25 11:29:35 +0100 |
commit | 8e0988139aa78db19ad41594b7935016399fc44f (patch) | |
tree | c5207702d8f3869b7ab84b0b225c82fd4bd70c65 /src | |
parent | 2c843c5bb9dd142eec5660bbc27067c769e0efb8 (diff) | |
download | ayatana-indicator-datetime-8e0988139aa78db19ad41594b7935016399fc44f.tar.gz ayatana-indicator-datetime-8e0988139aa78db19ad41594b7935016399fc44f.tar.bz2 ayatana-indicator-datetime-8e0988139aa78db19ad41594b7935016399fc44f.zip |
Check for lomiri-schemas package instead of individual files
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/main.cpp | 6 | ||||
-rw-r--r-- | src/snap.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cde5fe..d6d6844 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,11 +47,11 @@ set(SERVICE_GENERATED_SOURCES) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties org.ayatana.indicator ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.datetime.AlarmProperties.xml) -if(HAS_LOMIRI_ACCTSERVICE_SOUND) +if(LOMIRI_SCHEMAS_FOUND) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound com.lomiri.touch /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) - add_definitions (-DHAS_LOMIRI_ACCTSERVICE_SOUND) + add_definitions (-DHAS_LOMIRI_SCHEMAS) endif() # add warnings/coverage info on handwritten files diff --git a/src/main.cpp b/src/main.cpp index 613f700..0dc7198 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 HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS #include <datetime/snap.h> #endif #include <datetime/state.h> @@ -95,7 +95,7 @@ namespace return state; } -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS 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 HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS // 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"); diff --git a/src/snap.cpp b/src/snap.cpp index 45cd299..e306dea 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -19,7 +19,7 @@ * Robert Tari <robert@tari.in> */ -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS #include "dbus-accounts-sound.h" #include <datetime/snap.h> |