aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-10-31 22:41:09 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-01 10:39:58 +0100
commitede945145e96ecb3bde0dce0fd104c53f059cdca (patch)
tree8ef0e26d848b6c6ce0240ac521b62bc001fc89d5 /src
parentb942e307658c4e4fa72bc1184c53ae09f7bc3a74 (diff)
downloadayatana-indicator-datetime-ede945145e96ecb3bde0dce0fd104c53f059cdca.tar.gz
ayatana-indicator-datetime-ede945145e96ecb3bde0dce0fd104c53f059cdca.tar.bz2
ayatana-indicator-datetime-ede945145e96ecb3bde0dce0fd104c53f059cdca.zip
Rename HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS to HAS_LOMIRI_ACCTSERVICE_SOUND
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/main.cpp6
-rw-r--r--src/snap.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 118cee5..6132dfc 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(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+if(HAS_LOMIRI_ACCTSERVICE_SOUND)
add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound
com.lomiri.touch
/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml)
- add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+ add_definitions (-DHAS_LOMIRI_ACCTSERVICE_SOUND)
endif()
# add warnings/coverage info on handwritten files
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");
diff --git a/src/snap.cpp b/src/snap.cpp
index eb82b37..37ce741 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -19,7 +19,7 @@
* Robert Tari <robert@tari.in>
*/
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
#include "dbus-accounts-sound.h"
#include <datetime/snap.h>