From 611fb696d239afec803bd2fdfdcbc1b475ff3a26 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 10 Nov 2021 11:19:39 +0100
Subject: Drop org.ayatana.AccountsService.Sound

---
 tests/dbus-types/CMakeLists.txt                        | 14 +++++++-------
 tests/dbus-types/org.ayatana.AccountsService.Sound.xml |  9 ---------
 2 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 tests/dbus-types/org.ayatana.AccountsService.Sound.xml

(limited to 'tests/dbus-types')

diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt
index cbe382a..1b6faed 100644
--- a/tests/dbus-types/CMakeLists.txt
+++ b/tests/dbus-types/CMakeLists.txt
@@ -15,14 +15,10 @@ set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES
   CLASSNAME AccountsInterface)
 
 if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
-    set(dbusinterface_accountssound_xml "com.lomiri.AccountsService.Sound.xml")
-else()
-    set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml")
+    set_source_files_properties("com.lomiri.AccountsService.Sound.xml" PROPERTIES
+      CLASSNAME AccountsSoundInterface)
 endif()
 
-set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES
-  CLASSNAME AccountsSoundInterface)
-
 set(dbusinterface_properties_xml "org.freedesktop.DBus.Properties.xml")
 set_source_files_properties(${dbusinterface_properties_xml} PROPERTIES
   CLASSNAME DBusPropertiesInterface
@@ -41,7 +37,11 @@ set_source_files_properties(${dbusinterface_notifications_xml} PROPERTIES
 qt5_add_dbus_interface(interface_files ${dbusinterface_streamrestore_xml} stream_restore_interface)
 qt5_add_dbus_interface(interface_files ${dbusinterface_properties_xml} dbus_properties_interface)
 qt5_add_dbus_interface(interface_files ${dbusinterface_accounts_xml} dbus_accounts_interface)
-qt5_add_dbus_interface(interface_files ${dbusinterface_accountssound_xml} dbus_accountssound_interface)
+
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
+    qt5_add_dbus_interface("com.lomiri.AccountsService.Sound.xml" dbus_accountssound_interface)
+endif()
+
 qt5_add_dbus_interface(interface_files ${dbusinterface_actions_xml} dbus_menus_interface)
 qt5_add_dbus_interface(interface_files ${dbusinterface_notifications_xml} dbus_notifications_interface)
 
diff --git a/tests/dbus-types/org.ayatana.AccountsService.Sound.xml b/tests/dbus-types/org.ayatana.AccountsService.Sound.xml
deleted file mode 100644
index aa05cf3..0000000
--- a/tests/dbus-types/org.ayatana.AccountsService.Sound.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<node>
-  <interface name="org.ayatana.AccountsService.Sound">
-    <method name="Set">
-      <arg direction="in" type="s" name="interface" />
-      <arg direction="in" type="s" name="property" />
-      <arg direction="out" type="o" name="path" />
-    </method>
-  </interface>
-</node>
-- 
cgit v1.2.3