diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
commit | 85b39c9b481a3fe4d860a7dc47e7aa569e349a1b (patch) | |
tree | 2789c506aa47abcb47514aa964f2da8121da6613 /tests/integration | |
parent | eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca (diff) | |
parent | 6c745ba6709b7567d3929046bb9ecd9797048e70 (diff) | |
download | ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.gz ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.bz2 ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.zip |
Merge branch 'tari01-pr/rename-com-ubuntu-accountsservece-sound-gschema'
Attributes GH PR #48: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/48
Diffstat (limited to 'tests/integration')
-rw-r--r-- | tests/integration/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/integration/utils/dbus-pulse-volume.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e803a87..8193341 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -37,8 +37,8 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_HOME="${TEST_HOME}" ) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() set(GLIB_REQUIRED_VERSION 2.26) diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index cdbba6d..2338de1 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -140,8 +140,8 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) { QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply<void> set_vol = accounts_interface_->call(QLatin1String("Set"), -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS + QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), #endif |