diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 01:13:52 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-27 01:17:08 +0000 |
| commit | 01876018ef6af29a28a82c802fcc5de959e8109b (patch) | |
| tree | 5e7d418d40038025b9bb16ef8be3908b811674bb /tests/service-mocks | |
| parent | bc4bedc29d859040bc6ba052a5212a14a15c3578 (diff) | |
| download | ayatana-indicator-sound-01876018ef6af29a28a82c802fcc5de959e8109b.tar.gz ayatana-indicator-sound-01876018ef6af29a28a82c802fcc5de959e8109b.tar.bz2 ayatana-indicator-sound-01876018ef6af29a28a82c802fcc5de959e8109b.zip | |
data/org.ayatana.AccountsService.Sound: Use Ayatana namespace.
* Namespace switch from com.ubuntu to org.ayatana.
* Add AccountsServer interface for the greeter.
Obtained from accountsservice-ubuntu-schemas and adapted.
Diffstat (limited to 'tests/service-mocks')
| -rw-r--r-- | tests/service-mocks/accounts-mock/AccountsDefs.h | 2 | ||||
| -rw-r--r-- | tests/service-mocks/accounts-mock/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml (renamed from tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml) | 2 | ||||
| -rw-r--r-- | tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0e4f270..9933af0 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"; - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; } // namespace testing } // namespace indicators diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index ad858bd..6eb9fb5 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,14 +7,14 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") +set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES CLASSNAME AccountsServiceSoundMockInterface) qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservice_sound_interface) qt5_add_dbus_adaptor(adaptor_files - com.ubuntu.AccountsService.Sound.Mock.xml + org.ayatana.AccountsService.Sound.Mock.xml AccountsServiceSoundMock.h ubuntu::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml index daf82e5..ae9170f 100644 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml @@ -1,6 +1,6 @@ <!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="com.ubuntu.AccountsService.Sound"> + <interface name="org.ayatana.AccountsService.Sound"> <property name="Volume" type="d" access="readwrite"/> <property name="LastRunningPlayer" type="s" access="readwrite"/> </interface> diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 4d28b38..a000c4e 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"; - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; } // namespace testing } // namespace indicators |