From 384e727b89627fdb381500be29fc3880493ed634 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:30:56 +0100 Subject: Rename com.ubuntu.AccountsService.Sound --- data/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/accounts-service-access.vala | 2 +- tests/dbus-types/CMakeLists.txt | 4 ++-- tests/dbus-types/com.lomiri.AccountsService.Sound.xml | 9 +++++++++ tests/dbus-types/com.ubuntu.AccountsService.Sound.xml | 9 --------- tests/integration/CMakeLists.txt | 2 +- tests/integration/utils/dbus-pulse-volume.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsDefs.h | 2 +- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- .../accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml | 8 ++++++++ .../accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml | 8 -------- .../service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 tests/dbus-types/com.lomiri.AccountsService.Sound.xml delete mode 100644 tests/dbus-types/com.ubuntu.AccountsService.Sound.xml create mode 100644 tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml delete mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 0e30f7c..8e53533 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -102,7 +102,7 @@ DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d" # Accounts Service Iface: Greeter Sound ####################################### -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") # Nothing to do here... # Using files from Ubuntu specific package 'accountsservice-ubuntu-schemas'. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 761e87b..49d2715 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ else() set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") else() diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 9973704..4287d86 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -144,7 +144,7 @@ public class AccountsServiceAccess : Object if (user_path_variant.check_format_string ("(o)", true)) { user_path_variant.get ("(o)", out user_path); #if HAS_UT_ACCTSERVICE_SOUND_SETTINGS - _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound"); + _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.lomiri.AccountsService.Sound"); #else _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "org.ayatana.AccountsService.Sound"); #endif diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index 5323f51..cbe382a 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -14,8 +14,8 @@ set(dbusinterface_accounts_xml "org.freedesktop.Accounts.xml") 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.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + set(dbusinterface_accountssound_xml "com.lomiri.AccountsService.Sound.xml") else() set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") endif() diff --git a/tests/dbus-types/com.lomiri.AccountsService.Sound.xml b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml new file mode 100644 index 0000000..fb97049 --- /dev/null +++ b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml deleted file mode 100644 index 27c915a..0000000 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e803a87..eef04f2 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -37,7 +37,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_HOME="${TEST_HOME}" ) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) endif() diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index cdbba6d..b99a509 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -141,7 +141,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), + QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), #endif diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0a1806d..9726a9a 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.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 421e155..e737a07 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) - set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") + set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") endif() diff --git a/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml new file mode 100644 index 0000000..d51abd2 --- /dev/null +++ b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml deleted file mode 100644 index da9e8aa..0000000 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8a19db8..b43f162 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.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif -- cgit v1.2.3