diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-01 10:26:56 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-01 10:26:56 +0100 |
| commit | ab68e814235436b47905f054356798753fbf8009 (patch) | |
| tree | 31ffcd74916841f788b49f6077df13bd05143f68 /src | |
| parent | c589574a6c982febb768cc4830e8a63057e9b9f9 (diff) | |
| parent | ab8c534e8123bf3a9bfda7534da0f89106e3242b (diff) | |
| download | ayatana-indicator-sound-ab68e814235436b47905f054356798753fbf8009.tar.gz ayatana-indicator-sound-ab68e814235436b47905f054356798753fbf8009.tar.bz2 ayatana-indicator-sound-ab68e814235436b47905f054356798753fbf8009.zip | |
Merge branch 'tari01-pr/accountsservice-sound'
Attributes GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/41
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/accounts-service-system-sound-settings.vala | 8 | ||||
| -rw-r--r-- | src/accounts-service-user.vala | 10 |
3 files changed, 16 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc618d9..d157b58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,12 +18,12 @@ else() set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS OFF) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") + set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) set (VALA_FILE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "accounts-service-system-sound-settings") - set (VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS") + set (VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS") else() - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) + set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") @@ -226,7 +226,7 @@ if(${HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS}) ) endif() -if(${HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS}) +if(${HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS}) vala_add(ayatana-indicator-sound-service accounts-service-privacy-settings.vala ) diff --git a/src/accounts-service-system-sound-settings.vala b/src/accounts-service-system-sound-settings.vala index 9eb91c4..0fa3d0c 100644 --- a/src/accounts-service-system-sound-settings.vala +++ b/src/accounts-service-system-sound-settings.vala @@ -1,5 +1,6 @@ /* * Copyright 2014 © Canonical Ltd. + * Copyright 2021 © Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,10 +16,11 @@ * * Authors: * Ted Gould <ted@canonical.com> + * Robert Tari <robert@tari.in> */ -[DBus (name = "com.ubuntu.touch.AccountsService.Sound")] +[DBus (name = "com.lomiri.touch.AccountsService.Sound")] public interface AccountsServiceSystemSoundSettings : Object { - // properties - public abstract bool silent_mode {owned get; set;} + // properties + public abstract bool silent_mode {owned get; set;} } diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala index e7e2299..caffab9 100644 --- a/src/accounts-service-user.vala +++ b/src/accounts-service-user.vala @@ -1,5 +1,6 @@ /* * Copyright 2014 © Canonical Ltd. + * Copyright 2021 © Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,7 @@ * * Authors: * Ted Gould <ted@canonical.com> + * Robert Tari <robert@tari.in> */ public class AccountsServiceUser : Object { @@ -24,7 +26,7 @@ public class AccountsServiceUser : Object { #if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS AccountsServicePrivacySettings? privacyproxy = null; #endif -#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS AccountsServiceSystemSoundSettings? syssoundproxy = null; #endif uint timer = 0; @@ -40,7 +42,7 @@ public class AccountsServiceUser : Object { } set { _silentMode = value; -#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS if (syssoundproxy != null) syssoundproxy.silent_mode = value; #endif @@ -157,7 +159,7 @@ public class AccountsServiceUser : Object { new_privacy_proxy); #endif -#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS Bus.get_proxy.begin<AccountsServiceSystemSoundSettings> ( BusType.SYSTEM, "org.freedesktop.Accounts", @@ -214,7 +216,7 @@ public class AccountsServiceUser : Object { } #endif -#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS void new_system_sound_proxy (GLib.Object? obj, AsyncResult res) { try { this.syssoundproxy = Bus.get_proxy.end (res); |