diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
| commit | 85b39c9b481a3fe4d860a7dc47e7aa569e349a1b (patch) | |
| tree | 2789c506aa47abcb47514aa964f2da8121da6613 /src | |
| parent | eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca (diff) | |
| parent | 6c745ba6709b7567d3929046bb9ecd9797048e70 (diff) | |
| download | ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.gz ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.bz2 ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.zip | |
Merge branch 'tari01-pr/rename-com-ubuntu-accountsservece-sound-gschema'
Attributes GH PR #48: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/48
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/accounts-service-access.vala | 4 |
2 files changed, 4 insertions, 7 deletions
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 |