diff options
23 files changed, 45 insertions, 48 deletions
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/debian/copyright b/debian/copyright index 7bdcd9e..89bd33a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -152,7 +152,7 @@ Files: AUTHORS src/gmenuharness/CMakeLists.txt tests/CMakeLists.txt tests/dbus-types/CMakeLists.txt - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml + tests/dbus-types/com.lomiri.AccountsService.Sound.xml tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml tests/dbus-types/org.ayatana.AccountsService.Sound.xml tests/dbus-types/org.freedesktop.Accounts.xml @@ -166,7 +166,7 @@ Files: AUTHORS tests/manual tests/service-mocks/CMakeLists.txt tests/service-mocks/accounts-mock/CMakeLists.txt - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml + tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml tests/service-mocks/media-player-mpris-mock/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 761e87b..37074e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,11 +23,8 @@ else() set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) - set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") -else() - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS OFF) +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS") endif() vapi_gen(accounts-service diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 9973704..19a27c6 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -143,8 +143,8 @@ public class AccountsServiceAccess : Object string user_path; 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"); +#if HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS + _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.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml index 27c915a..fb97049 100644 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml @@ -1,5 +1,5 @@ <node> - <interface name="com.ubuntu.AccountsService.Sound"> + <interface name="com.lomiri.AccountsService.Sound"> <method name="Set"> <arg direction="in" type="s" name="interface" /> <arg direction="in" type="s" name="property" /> diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e803a87..8193341 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -37,8 +37,8 @@ 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") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() set(GLIB_REQUIRED_VERSION 2.26) diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index cdbba6d..2338de1 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -140,8 +140,8 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) { QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply<void> set_vol = accounts_interface_->call(QLatin1String("Set"), -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS + QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), #endif diff --git a/tests/service-mocks/DBusPropertiesNotifier.cpp b/tests/service-mocks/DBusPropertiesNotifier.cpp index 686e4e9..00313a7 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.cpp +++ b/tests/service-mocks/DBusPropertiesNotifier.cpp @@ -20,7 +20,7 @@ #include <QDBusMessage> -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; void DBusPropertiesNotifier::notifyPropertyChanged(QDBusConnection const & connection, QString const & interface, diff --git a/tests/service-mocks/DBusPropertiesNotifier.h b/tests/service-mocks/DBusPropertiesNotifier.h index 9fa013b..236a051 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.h +++ b/tests/service-mocks/DBusPropertiesNotifier.h @@ -19,7 +19,7 @@ #include <QDBusConnection> -namespace ubuntu +namespace ayatana { namespace indicators @@ -45,4 +45,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0a1806d..bf66208 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -28,8 +28,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_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; +#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 @@ -37,4 +37,4 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsMock.cpp b/tests/service-mocks/accounts-mock/AccountsMock.cpp index 5c92dc5..af2065a 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsMock.cpp @@ -20,7 +20,7 @@ #include "AccountsMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsMock::AccountsMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsMock.h b/tests/service-mocks/accounts-mock/AccountsMock.h index 72372e0..e8efbdb 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.h +++ b/tests/service-mocks/accounts-mock/AccountsMock.h @@ -21,7 +21,7 @@ #include <QDBusObjectPath> #include <QObject> -namespace ubuntu +namespace ayatana { namespace indicators @@ -47,4 +47,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp index b0e4862..e4f83ed 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp @@ -22,7 +22,7 @@ #include "AccountsServiceSoundMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsServiceSoundMock::AccountsServiceSoundMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h index fd5104e..bcc2413 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h @@ -22,7 +22,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -59,4 +59,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 421e155..1549249 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") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) - set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") +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() @@ -22,13 +22,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservic qt5_add_dbus_adaptor(adaptor_files ${dbusinterface_sound_xml} AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock + ayatana::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml AccountsMock.h - ubuntu::indicators::testing::AccountsMock + ayatana::indicators::testing::AccountsMock AccountsMockAdaptor) add_executable( diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml index da9e8aa..d51abd2 100644 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ b/tests/service-mocks/accounts-mock/com.lomiri.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="com.lomiri.AccountsService.Sound"> <property name="Volume" type="d" access="readwrite"/> <property name="LastRunningPlayer" type="s" access="readwrite"/> </interface> diff --git a/tests/service-mocks/accounts-mock/main.cpp b/tests/service-mocks/accounts-mock/main.cpp index d6cd1d3..f937022 100644 --- a/tests/service-mocks/accounts-mock/main.cpp +++ b/tests/service-mocks/accounts-mock/main.cpp @@ -26,7 +26,7 @@ #include "AccountsMock.h" #include "AccountsMockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index f0c06e6..4f58791 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() add_definitions(-DQT_NO_KEYWORDS=1) @@ -23,13 +23,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_mediaplayermpris_xml} Med qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.Player.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayerMprisMockAdaptor) qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayer2MockAdaptor) add_executable( diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8a19db8..24fa986 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -28,8 +28,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_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; +#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 @@ -37,5 +37,5 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp index 25fe0b7..9ec9905 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp @@ -19,7 +19,7 @@ #include "MediaPlayerMprisMock.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; MediaPlayerMprisMock::MediaPlayerMprisMock(QString const &playerName, QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h index 58dce8d..0a45075 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h @@ -23,7 +23,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -74,4 +74,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/main.cpp b/tests/service-mocks/media-player-mpris-mock/main.cpp index 8945673..877f59f 100644 --- a/tests/service-mocks/media-player-mpris-mock/main.cpp +++ b/tests/service-mocks/media-player-mpris-mock/main.cpp @@ -25,7 +25,7 @@ #include "MediaPlayerMprisMockAdaptor.h" #include "MediaPlayer2MockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { |