diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 07:47:15 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 07:47:15 +0100 |
| commit | f67f74e2569cb5061261bbb34065ac3680fa4e57 (patch) | |
| tree | 6bc49eff1d2571e92f7794af8b2e34423e3faf00 | |
| parent | 9b7a0b23491dd423be362215dec27ba0d420c99f (diff) | |
| download | ayatana-indicator-sound-f67f74e2569cb5061261bbb34065ac3680fa4e57.tar.gz ayatana-indicator-sound-f67f74e2569cb5061261bbb34065ac3680fa4e57.tar.bz2 ayatana-indicator-sound-f67f74e2569cb5061261bbb34065ac3680fa4e57.zip | |
More namespacing mess clean-ups. (We mixed up com.ubuntu with com.canonical...).
| -rw-r--r-- | tests/dbus-types/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/dbus-types/com.ubuntu.AccountsService.Sound.xml (renamed from tests/dbus-types/com.canonical.AccountsService.Sound.xml) | 2 | ||||
| -rw-r--r-- | tests/service-mocks/accounts-mock/AccountsDefs.h | 3 | ||||
| -rw-r--r-- | tests/service-mocks/accounts-mock/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index 45369cf..f669bca 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -15,7 +15,7 @@ set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES CLASSNAME AccountsInterface) if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - set(dbusinterface_accountssound_xml "com.canonical.AccountsService.Sound.xml") + set(dbusinterface_accountssound_xml "com.ubuntu.AccountsService.Sound.xml") set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES CLASSNAME AccountsSoundInterface) else() diff --git a/tests/dbus-types/com.canonical.AccountsService.Sound.xml b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml index 7d27675..27c915a 100644 --- a/tests/dbus-types/com.canonical.AccountsService.Sound.xml +++ b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml @@ -1,5 +1,5 @@ <node> - <interface name="com.canonical.AccountsService.Sound"> + <interface name="com.ubuntu.AccountsService.Sound"> <method name="Set"> <arg direction="in" type="s" name="interface" /> <arg direction="in" type="s" name="property" /> diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index ca71f9d..0a1806d 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.canonical.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif @@ -38,4 +38,3 @@ namespace testing } // namespace indicators } // namespace ubuntu - diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 17892f3..9ef32fa 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -19,11 +19,19 @@ set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservice_sound_interface) -qt5_add_dbus_adaptor(adaptor_files - org.ayatana.AccountsService.Sound.Mock.xml - AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock - AccountsServiceSoundMockAdaptor) +if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") + qt5_add_dbus_adaptor(adaptor_files + com.ubuntu.AccountsService.Sound.Mock.xml + AccountsServiceSoundMock.h + ubuntu::indicators::testing::AccountsServiceSoundMock + AccountsServiceSoundMockAdaptor) +else() + qt5_add_dbus_adaptor(adaptor_files + org.ayatana.AccountsService.Sound.Mock.xml + AccountsServiceSoundMock.h + ubuntu::indicators::testing::AccountsServiceSoundMock + AccountsServiceSoundMockAdaptor) +endif() qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 6a53962..8a19db8 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.canonical.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif |