aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-03 21:10:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-08 12:47:19 +0100
commit64cb8b30764718a2a4f5b5a077b3a8686bbd7329 (patch)
treef38fc45b061f3f340b51a47d1fa7cb3396fe334c
parenteb1f2fb365bd5e850e49c2d989a85d9a7b8531fe (diff)
downloadayatana-indicator-sound-64cb8b30764718a2a4f5b5a077b3a8686bbd7329.tar.gz
ayatana-indicator-sound-64cb8b30764718a2a4f5b5a077b3a8686bbd7329.tar.bz2
ayatana-indicator-sound-64cb8b30764718a2a4f5b5a077b3a8686bbd7329.zip
Rename HAS_UBUNTU_SOUND_SCHEMA
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/options-gsettings.vala2
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/integration/indicator-sound-test-base.cpp2
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"