From 1ca91789f224d76507e2a2eac1cfef46c5c3c902 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 3 Nov 2021 21:04:41 +0100
Subject: Rename com.ubuntu.sound

---
 data/CMakeLists.txt                             | 2 +-
 data/org.ayatana.indicator.sound.gschema.xml    | 6 +++---
 src/CMakeLists.txt                              | 2 +-
 src/options-gsettings.vala                      | 2 +-
 tests/CMakeLists.txt                            | 4 ++--
 tests/integration/indicator-sound-test-base.cpp | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e9ed905..0e30f7c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -66,7 +66,7 @@ install(
 
 add_schema ("org.ayatana.indicator.sound.gschema.xml")
 
-if(NOT EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml)
+if(NOT EXISTS /usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml)
   add_schema ("org.ayatana.sound.gschema.xml")
 endif()
 
diff --git a/data/org.ayatana.indicator.sound.gschema.xml b/data/org.ayatana.indicator.sound.gschema.xml
index de9c8b9..b94213c 100644
--- a/data/org.ayatana.indicator.sound.gschema.xml
+++ b/data/org.ayatana.indicator.sound.gschema.xml
@@ -82,7 +82,7 @@
       <default>0</default>
       <summary>Normal output volume.</summary>
       <description>
-        The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is disabled.
+        The maximum volume when com.lomiri.sound's 'allow-amplified-volume' setting is disabled.
 
         To conform with EU standard EN 60950-1/Al2, this value should never be
         set to a dB that causes headphone sound output to exceed 100 dBA, nor
@@ -94,9 +94,9 @@
 
     <key name="amplified-volume-decibels" type="d">
       <default>11</default>
-      <summary>Output volume to use when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled.</summary>
+      <summary>Output volume to use when com.lomiri.sound's 'allow-amplified-volume' setting is enabled.</summary>
       <description>
-        The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled.
+        The maximum volume when com.lomiri.sound's 'allow-amplified-volume' setting is enabled.
 
         To conform with EU standard EN 60950-1/Al2, this value should never be
         set to a dB that causes headphone sound output to exceed 100 dBA, nor
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6706222..13576f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.h")
 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.ubuntu.sound.gschema.xml")
+if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml")
   set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA")
 endif()
 
diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala
index 7c187f9..5284011 100644
--- a/src/options-gsettings.vala
+++ b/src/options-gsettings.vala
@@ -32,7 +32,7 @@ public class IndicatorSound.OptionsGSettings : Options
 
         private Settings _settings = new Settings ("org.ayatana.indicator.sound");
 #if HAS_UBUNTU_SOUND_SCHEMA
-        private Settings _shared_settings = new Settings ("com.ubuntu.sound");
+        private Settings _shared_settings = new Settings ("com.lomiri.sound");
 #else
         private Settings _shared_settings = new Settings ("org.ayatana.sound");
 #endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 10c3cf5..9a80bdd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,8 +33,8 @@ add_custom_target (
 # and help the tests to find that file by setting -DSCHEMA_DIR
 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.ubuntu.sound.gschema.xml)
-  set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml)
+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 )
 else()
   set (SOUND_SCHEMA  ${CMAKE_SOURCE_DIR}/data/org.ayatana.sound.gschema.xml)
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index b92cc9f..869139b 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -184,7 +184,7 @@ bool IndicatorSoundTestBase::resetAllowAmplifiedVolume()
     proc.start("gsettings", QStringList()
                                 << "reset"
 #ifdef HAS_UBUNTU_SOUND_SCHEMA
-                                << "com.ubuntu.sound"
+                                << "com.lomiri.sound"
 #else
                                 << "org.ayatana.sound"
 #endif
-- 
cgit v1.2.3