diff options
| author | Robert Tari <robert@tari.in> | 2021-11-03 21:54:40 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:47:19 +0100 |
| commit | ed47e0fd57235565fe5800cb29d97773ac5c6dc5 (patch) | |
| tree | b72003801bb60c3f7a49ab930b2b2d459d225e0c /tests | |
| parent | 9b7fe562fd8bb40baa524092bfea8d15de41262f (diff) | |
| download | ayatana-indicator-sound-ed47e0fd57235565fe5800cb29d97773ac5c6dc5.tar.gz ayatana-indicator-sound-ed47e0fd57235565fe5800cb29d97773ac5c6dc5.tar.bz2 ayatana-indicator-sound-ed47e0fd57235565fe5800cb29d97773ac5c6dc5.zip | |
Rename HAS_UT_ACCTSERVICE_SOUND_SETTINGS
Diffstat (limited to 'tests')
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index eef04f2..8193341 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -38,7 +38,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s ) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + 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 b99a509..2338de1 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -140,7 +140,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_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 9726a9a..660f240 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char ACCOUNTS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index e737a07..bcb9608 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index f0c06e6..e4ccc71 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() add_definitions(-DQT_NO_KEYWORDS=1) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index b43f162..8fd3bda 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char MEDIA_PLAYER_MPRIS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; |