aboutsummaryrefslogtreecommitdiff
path: root/tests/service-mocks/accounts-mock
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-10 11:19:39 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-12 13:13:10 +0100
commit611fb696d239afec803bd2fdfdcbc1b475ff3a26 (patch)
treef7131a27f3a989d1294740466fed4f33af84cd6e /tests/service-mocks/accounts-mock
parent27963fd99ac38eee2477ec6ae6e8d2882959994a (diff)
downloadayatana-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/accounts-mock')
-rw-r--r--tests/service-mocks/accounts-mock/AccountsDefs.h10
-rw-r--r--tests/service-mocks/accounts-mock/CMakeLists.txt8
-rw-r--r--tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml7
3 files changed, 6 insertions, 19 deletions
diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h
index bf66208..db7cdfe 100644
--- a/tests/service-mocks/accounts-mock/AccountsDefs.h
+++ b/tests/service-mocks/accounts-mock/AccountsDefs.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 ACCOUNTS_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
diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt
index 1549249..da9bc99 100644
--- a/tests/service-mocks/accounts-mock/CMakeLists.txt
+++ b/tests/service-mocks/accounts-mock/CMakeLists.txt
@@ -6,13 +6,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/tests/service-mocks")
add_definitions(-DQT_NO_KEYWORDS=1)
-
-if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
- 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")
-endif()
+set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml")
set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES
CLASSNAME AccountsServiceSoundMockInterface)
diff --git a/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml
deleted file mode 100644
index ae9170f..0000000
--- a/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
- <interface name="org.ayatana.AccountsService.Sound">
- <property name="Volume" type="d" access="readwrite"/>
- <property name="LastRunningPlayer" type="s" access="readwrite"/>
- </interface>
-</node> \ No newline at end of file