diff options
| author | Robert Tari <robert@tari.in> | 2021-11-10 11:19:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-12 13:13:10 +0100 |
| commit | 611fb696d239afec803bd2fdfdcbc1b475ff3a26 (patch) | |
| tree | f7131a27f3a989d1294740466fed4f33af84cd6e /tests/dbus-types | |
| parent | 27963fd99ac38eee2477ec6ae6e8d2882959994a (diff) | |
| download | ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.tar.gz ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.tar.bz2 ayatana-indicator-sound-611fb696d239afec803bd2fdfdcbc1b475ff3a26.zip | |
Drop org.ayatana.AccountsService.Sound
Diffstat (limited to 'tests/dbus-types')
| -rw-r--r-- | tests/dbus-types/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/dbus-types/org.ayatana.AccountsService.Sound.xml | 9 |
2 files changed, 7 insertions, 16 deletions
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> |