From 1ca91789f224d76507e2a2eac1cfef46c5c3c902 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:04:41 +0100 Subject: Rename com.ubuntu.sound --- tests/CMakeLists.txt | 4 ++-- tests/integration/indicator-sound-test-base.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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 From 45c279316fe33302d1348ef91a5851643c207f64 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:10:43 +0100 Subject: Rename HAS_UBUNTU_SOUND_SCHEMA --- tests/CMakeLists.txt | 2 +- tests/integration/indicator-sound-test-base.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') 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