From b942e307658c4e4fa72bc1184c53ae09f7bc3a74 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Sun, 31 Oct 2021 22:22:08 +0100
Subject: Drop local file and generate code from
 /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml

---
 po/POTFILES.in                                 |  1 -
 src/CMakeLists.txt                             |  2 +-
 src/com.ubuntu.touch.AccountsService.Sound.xml | 47 --------------------------
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 src/com.ubuntu.touch.AccountsService.Sound.xml

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72daf17..fe5cde1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,4 +33,3 @@ src/timezone-timedated.cpp
 src/wakeup-timer-mainloop.cpp
 src/wakeup-timer-powerd.cpp
 src/utils.c
-src/com.ubuntu.touch.AccountsService.Sound.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 595acd9..118cee5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,7 @@ add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties
 if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
         add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound
                           com.lomiri.touch
-                          ${CMAKE_SOURCE_DIR}/src/com.lomiri.touch.AccountsService.Sound.xml)
+                          /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml)
         add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
 endif()
 
diff --git a/src/com.ubuntu.touch.AccountsService.Sound.xml b/src/com.ubuntu.touch.AccountsService.Sound.xml
deleted file mode 100644
index 781a52f..0000000
--- a/src/com.ubuntu.touch.AccountsService.Sound.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<node>
-    <interface name="com.ubuntu.touch.AccountsService.Sound">
-
-        <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
-
-        <!-- Muted is all sound, SilentMode is only non-user-initiated sounds -->
-        <property name="SilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
-        </property>
-
-        <property name="IncomingCallSound" type="s" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue.String"
-                value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
-        </property>
-
-        <property name="IncomingMessageSound" type="s" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue.String"
-                value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
-        </property>
-
-        <property name="IncomingCallVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingCallVibrateSilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingMessageVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="IncomingMessageVibrateSilentMode" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <!-- "Other vibrations" should cover all vibrations except for those relating to phone calls and messages -->
-        <property name="OtherVibrate" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-        <property name="DialpadSoundsEnabled" type="b" access="readwrite">
-            <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
-        </property>
-
-    </interface>
-</node>
-- 
cgit v1.2.3