diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 09:06:58 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 09:06:58 +0100 |
| commit | eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca (patch) | |
| tree | bfccd1d744494c460fdb451d32131e19da7fa9a4 /tests | |
| parent | 46d0cb4f163c33d3c34bbe162674778aed58278a (diff) | |
| parent | 45c279316fe33302d1348ef91a5851643c207f64 (diff) | |
| download | ayatana-indicator-sound-eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca.tar.gz ayatana-indicator-sound-eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca.tar.bz2 ayatana-indicator-sound-eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca.zip | |
Merge branch 'tari01-pr/rename-com-ubuntu-sound-gschema'
Attributes GH PR #47: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/47
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 10c3cf5..75dab34 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -33,9 +33,9 @@ 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) - add_definitions ( -DHAS_UBUNTU_SOUND_SCHEMA ) +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_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 b92cc9f..5812a04 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -183,8 +183,8 @@ bool IndicatorSoundTestBase::resetAllowAmplifiedVolume() proc.start("gsettings", QStringList() << "reset" -#ifdef HAS_UBUNTU_SOUND_SCHEMA - << "com.ubuntu.sound" +#ifdef HAS_LOMIRI_SOUND_SCHEMA + << "com.lomiri.sound" #else << "org.ayatana.sound" #endif |