From c8aae42d9199448176c287abd02bcb31f5e50a35 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Mon, 1 Nov 2021 00:54:01 +0100
Subject: *_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS to HAS_LOMIRI_ACCTSERVICE_SOUND

---
 src/CMakeLists.txt |  2 +-
 src/notifier.c     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a460de..d50d065 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-testing
                                  Dbus
                                  ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.power.Testing.xml)
 
-if (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+if (HAS_LOMIRI_ACCTSERVICE_SOUND)
     add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-accounts-sound
                                      com.lomiri.touch
                                      Dbus
diff --git a/src/notifier.c b/src/notifier.c
index 26a8ce7..4bd55c1 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -21,7 +21,7 @@
 
 #include "datafiles.h"
 
-#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
 #include "dbus-accounts-sound.h"
 #endif
 
@@ -86,7 +86,7 @@ typedef struct
   gboolean actions_supported;
 
   GCancellable * cancellable;
-  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
   DbusAccountsServiceSound * accounts_service_sound_proxy;
   gboolean accounts_service_sound_proxy_pending;
   #endif
@@ -147,7 +147,7 @@ get_battery_power_level (IndicatorPowerDevice * battery)
 ****  Sounds
 ***/
 
-#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
 static void
 on_sound_proxy_ready (GObject      * source_object G_GNUC_UNUSED,
                       GAsyncResult * res,
@@ -309,7 +309,7 @@ notification_show(IndicatorPowerNotifier * self)
 
   if (are_actions_supported(self))
     {
-      #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+      #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
       if (!silent_mode(self))
       #endif
         {
@@ -453,7 +453,7 @@ my_dispose (GObject * o)
   indicator_power_notifier_set_battery (self, NULL);
   g_clear_object (&p->dbus_battery);
 
-  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
   g_clear_object (&p->accounts_service_sound_proxy);
   #endif
 
@@ -490,7 +490,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
   if (!instance_count++ && !notify_init(SERVICE_EXEC))
     g_critical("Unable to initialize libnotify! Notifications might not be shown.");
 
-  #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+  #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
   p->accounts_service_sound_proxy_pending = TRUE;
   gchar* object_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid());
   dbus_accounts_service_sound_proxy_new_for_bus(
-- 
cgit v1.2.3