aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-02 22:13:22 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-02 22:13:22 +0100
commit8fe910c4032192882df4bab6524a2378765ca8dc (patch)
treeac5839a41744ba6d33c26d17e3fbc02dd24d9a67
parentddaaefc32b5df3bdc409e57b1cb2168e2e521fda (diff)
parentd3896987e913ce4594bbc523394c90a0b0e4b6d8 (diff)
downloadayatana-indicator-sound-8fe910c4032192882df4bab6524a2378765ca8dc.tar.gz
ayatana-indicator-sound-8fe910c4032192882df4bab6524a2378765ca8dc.tar.bz2
ayatana-indicator-sound-8fe910c4032192882df4bab6524a2378765ca8dc.zip
Merge branch 'tari01-pr/rename-com-ubuntu-touchaccountsservice-securityprivacy'
Attributes GH PR #43: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/43
-rw-r--r--src/CMakeLists.txt7
-rw-r--r--src/accounts-service-privacy-settings.vala8
-rw-r--r--src/accounts-service-user.vala6
3 files changed, 9 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d157b58..f886f81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,12 +10,9 @@ if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA")
endif()
-if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml")
- set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS ON)
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml")
set (VALA_FILE_ACCTSERVICE_PRIVACY_SETTINGS "accounts-service-privacy-settings")
- set (VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS "--define=HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS")
-else()
- set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS OFF)
+ set (VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS")
endif()
if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml")
diff --git a/src/accounts-service-privacy-settings.vala b/src/accounts-service-privacy-settings.vala
index 1f5838c..da08020 100644
--- a/src/accounts-service-privacy-settings.vala
+++ b/src/accounts-service-privacy-settings.vala
@@ -17,9 +17,9 @@
* Ted Gould <ted@canonical.com>
*/
-[DBus (name = "com.ubuntu.touch.AccountsService.SecurityPrivacy")]
+[DBus (name = "com.lomiri.touch.AccountsService.SecurityPrivacy")]
public interface AccountsServicePrivacySettings : Object {
- // properties
- public abstract bool stats_welcome_screen {owned get; set;}
- public abstract bool messages_welcome_screen {owned get; set;}
+ // properties
+ public abstract bool stats_welcome_screen {owned get; set;}
+ public abstract bool messages_welcome_screen {owned get; set;}
}
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index caffab9..0679392 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -23,7 +23,7 @@ public class AccountsServiceUser : Object {
Act.UserManager accounts_manager = Act.UserManager.get_default();
Act.User? user = null;
AccountsServiceSoundSettings? proxy = null;
-#if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS
AccountsServicePrivacySettings? privacyproxy = null;
#endif
#if HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS
@@ -149,7 +149,7 @@ public class AccountsServiceUser : Object {
DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
null,
new_sound_proxy);
-#if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS
Bus.get_proxy.begin<AccountsServicePrivacySettings> (
BusType.SYSTEM,
"org.freedesktop.Accounts",
@@ -191,7 +191,7 @@ public class AccountsServiceUser : Object {
}
}
-#if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS
+#if HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS
void new_privacy_proxy (GLib.Object? obj, AsyncResult res) {
try {
this.privacyproxy = Bus.get_proxy.end (res);