aboutsummaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-10 12:56:31 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-10 12:56:31 +0100
commit8a777394370b17a6bc9e4eab2cf13f1e0317384d (patch)
tree076891a8363835aa0720a45cef5e6b44f31cbe04 /tests/integration
parentc6c9d5d998e63046d25707da573c7ace3a153793 (diff)
parent147d57e4b54fb59d5a956f8e3ea45748f973209e (diff)
downloadayatana-indicator-sound-8a777394370b17a6bc9e4eab2cf13f1e0317384d.tar.gz
ayatana-indicator-sound-8a777394370b17a6bc9e4eab2cf13f1e0317384d.tar.bz2
ayatana-indicator-sound-8a777394370b17a6bc9e4eab2cf13f1e0317384d.zip
Merge branch 'tari01-pr/drop-org-ayatana-sound'
Attributes GH PR #64: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/64
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/indicator-sound-test-base.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index 45e8acc..3217764 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -179,18 +179,20 @@ bool IndicatorSoundTestBase::clearGSettingsPlayers()
bool IndicatorSoundTestBase::resetAllowAmplifiedVolume()
{
+#if HAS_LOMIRI_SOUND_SCHEMA
QProcess proc;
proc.start("gsettings", QStringList()
<< "reset"
-#ifdef HAS_LOMIRI_SOUND_SCHEMA
+
<< "com.lomiri.sound"
-#else
- << "org.ayatana.sound"
-#endif
+
<< "allow-amplified-volume");
return runProcess(proc);
+#else
+ return TRUE;
+#endif
}
bool IndicatorSoundTestBase::runProcess(QProcess& proc)