From ab8c534e8123bf3a9bfda7534da0f89106e3242b Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Mon, 1 Nov 2021 01:45:41 +0100
Subject: Rename *_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS to
 HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS

---
 src/CMakeLists.txt             |  8 ++++----
 src/accounts-service-user.vala | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aba0e2c..d157b58 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,11 +19,11 @@ else()
 endif()
 
 if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml")
-  set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON)
+  set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON)
   set (VALA_FILE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "accounts-service-system-sound-settings")
-  set (VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS")
+  set (VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS")
 else()
-  set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF)
+  set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF)
 endif()
 
 if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml")
@@ -226,7 +226,7 @@ if(${HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS})
     )
 endif()
 
-if(${HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS})
+if(${HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS})
     vala_add(ayatana-indicator-sound-service
           accounts-service-privacy-settings.vala
     )
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index e7e2299..caffab9 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 © Canonical Ltd.
+ * Copyright 2021 © Robert Tari
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,6 +16,7 @@
  *
  * Authors:
  *      Ted Gould <ted@canonical.com>
+ *      Robert Tari <robert@tari.in>
  */
 
 public class AccountsServiceUser : Object {
@@ -24,7 +26,7 @@ public class AccountsServiceUser : Object {
 #if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS
     AccountsServicePrivacySettings? privacyproxy = null;
 #endif
-#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS
     AccountsServiceSystemSoundSettings? syssoundproxy = null;
 #endif
     uint timer = 0;
@@ -40,7 +42,7 @@ public class AccountsServiceUser : Object {
         }
         set {
             _silentMode = value;
-#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS
             if (syssoundproxy != null)
                 syssoundproxy.silent_mode = value;
 #endif
@@ -157,7 +159,7 @@ public class AccountsServiceUser : Object {
                 new_privacy_proxy);
 #endif
 
-#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS
             Bus.get_proxy.begin<AccountsServiceSystemSoundSettings> (
                 BusType.SYSTEM,
                 "org.freedesktop.Accounts",
@@ -214,7 +216,7 @@ public class AccountsServiceUser : Object {
     }
 #endif
 
-#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS
     void new_system_sound_proxy (GLib.Object? obj, AsyncResult res) {
         try {
             this.syssoundproxy = Bus.get_proxy.end (res);
-- 
cgit v1.2.3