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/service-mocks/media-player-mpris-mock | |
| 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/service-mocks/media-player-mpris-mock')
| -rw-r--r-- | tests/service-mocks/media-player-mpris-mock/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index 08ff68f..b7284bb 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -8,10 +8,6 @@ find_package(Qt5DBus REQUIRED) include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") -if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.SecurityPrivacy.xml") - add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) -endif() - add_definitions(-DQT_NO_KEYWORDS=1) set(dbusinterface_mediaplayermpris_xml "org.mpris.MediaPlayer2.Player.xml") diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 24fa986..214555b 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -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> */ #pragma once @@ -28,11 +31,8 @@ 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_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"; -#endif + } // namespace testing } // namespace indicators |