diff options
| author | Robert Tari <robert@tari.in> | 2021-11-10 11:19:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-12 13:13:10 +0100 |
| commit | 611fb696d239afec803bd2fdfdcbc1b475ff3a26 (patch) | |
| tree | f7131a27f3a989d1294740466fed4f33af84cd6e /tests/integration | |
| parent | 27963fd99ac38eee2477ec6ae6e8d2882959994a (diff) | |
| download | ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.tar.gz ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.tar.bz2 ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.zip | |
Drop org.ayatana.AccountsService.Sound
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/integration/utils/dbus-pulse-volume.cpp | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index a21ce0e..164ab8b 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -38,10 +38,6 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_HOME="${TEST_HOME}" ) -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) pkg_check_modules( diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index 2338de1..fa3ca3e 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Canonical, Ltd. + * Copyright (C) 2021 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -13,7 +14,9 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * - * Author: Xavi Garcia <xavi.garcia.mena@canonical.com> + * Authors: + * Xavi Garcia <xavi.garcia.mena@canonical.com> + * Robert Tari <robert@tari.in> */ #include "dbus-pulse-volume.h" @@ -140,11 +143,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) { QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply<void> set_vol = accounts_interface_->call(QLatin1String("Set"), -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), -#else - QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), -#endif QVariant::fromValue(QString("Volume")), QVariant::fromValue(dbusVar)); if (!set_vol.isValid()) |