From 45c279316fe33302d1348ef91a5851643c207f64 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 3 Nov 2021 21:10:43 +0100
Subject: Rename HAS_UBUNTU_SOUND_SCHEMA

---
 src/CMakeLists.txt                              | 2 +-
 src/options-gsettings.vala                      | 2 +-
 tests/CMakeLists.txt                            | 2 +-
 tests/integration/indicator-sound-test-base.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c04550..761e87b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def")
 set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi")
 
 if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml")
-  set (VALA_DEFINE_LOMIRI_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA")
+  set (VALA_DEFINE_LOMIRI_SOUND_SCHEMA "--define=HAS_LOMIRI_SOUND_SCHEMA")
 endif()
 
 if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml")
diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala
index 5284011..5691a17 100644
--- a/src/options-gsettings.vala
+++ b/src/options-gsettings.vala
@@ -31,7 +31,7 @@ public class IndicatorSound.OptionsGSettings : Options
     }
 
         private Settings _settings = new Settings ("org.ayatana.indicator.sound");
-#if HAS_UBUNTU_SOUND_SCHEMA
+#if HAS_LOMIRI_SOUND_SCHEMA
         private Settings _shared_settings = new Settings ("com.lomiri.sound");
 #else
         private Settings _shared_settings = new Settings ("org.ayatana.sound");
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9a80bdd..75dab34 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas")
 set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas")
 if (EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
   set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
-  add_definitions ( -DHAS_UBUNTU_SOUND_SCHEMA )
+  add_definitions ( -DHAS_LOMIRI_SOUND_SCHEMA )
 else()
   set (SOUND_SCHEMA  ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml)
 endif()
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index 869139b..5812a04 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -183,7 +183,7 @@ bool IndicatorSoundTestBase::resetAllowAmplifiedVolume()
 
     proc.start("gsettings", QStringList()
                                 << "reset"
-#ifdef HAS_UBUNTU_SOUND_SCHEMA
+#ifdef HAS_LOMIRI_SOUND_SCHEMA
                                 << "com.lomiri.sound"
 #else
                                 << "org.ayatana.sound"
-- 
cgit v1.2.3