From 81c64f0c47c1c58957c501efec7aaa8435a6c8e3 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 2 Nov 2021 21:08:07 +0100 Subject: Rename com.ubuntu.touch.AccountsService.SecurityPrivacy --- src/CMakeLists.txt | 2 +- src/accounts-service-privacy-settings.vala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d157b58..5aa743e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,7 @@ 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") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml") set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS ON) set (VALA_FILE_ACCTSERVICE_PRIVACY_SETTINGS "accounts-service-privacy-settings") set (VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS "--define=HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS") 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 */ -[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;} } -- cgit v1.2.3 From 202a6d86edc95c87109b1104cf287b05b1c0e3ed Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 2 Nov 2021 21:09:48 +0100 Subject: src/CMakeLists.txt: Drop unused HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS --- src/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5aa743e..56fe6ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,11 +11,8 @@ if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml") endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.SecurityPrivacy.xml") - set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS ON) 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) endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") -- cgit v1.2.3 From d3896987e913ce4594bbc523394c90a0b0e4b6d8 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 2 Nov 2021 21:12:59 +0100 Subject: Rename HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS --- src/CMakeLists.txt | 2 +- src/accounts-service-user.vala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56fe6ba..f886f81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,7 @@ endif() 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") + 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-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 ( 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); -- cgit v1.2.3