From c6b84c6ed249d65775e95ecce53ef4b8c3b55562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 23 Mar 2023 19:27:17 +0100
Subject: [PATCH] Allow to define an Introspectable interface in XML files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 src/interfaces/org.bluez.MediaPlayer1.xml            |  2 --
 src/interfaces/org.bluez.adapter.xml                 |  4 +---
 src/interfaces/org.bluez.device.xml                  |  4 +---
 src/interfaces/org.bluez.manager.xml                 |  4 +---
 src/interfaces/org.bluez.obex.Agent1.xml             |  3 +--
 src/interfaces/org.bluez.obex.client.xml             |  4 +---
 .../org.freedesktop.DBus.ObjectManager.xml           |  4 +---
 src/interfaces/org.tdebluez.agent.xml                | 12 +++++-------
 8 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/interfaces/org.bluez.MediaPlayer1.xml b/src/interfaces/org.bluez.MediaPlayer1.xml
index 1ce4d59..bd7c6df 100644
--- a/src/interfaces/org.bluez.MediaPlayer1.xml
+++ b/src/interfaces/org.bluez.MediaPlayer1.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-<!--
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="xml" type="s" direction="out"/>
     </method>
   </interface>
--->
   <interface name="org.bluez.MediaPlayer1">
     <method name="Play"/>
     <method name="Pause"/>
diff --git a/src/interfaces/org.bluez.adapter.xml b/src/interfaces/org.bluez.adapter.xml
index 4cdd6a5..c681bb2 100644
--- a/src/interfaces/org.bluez.adapter.xml
+++ b/src/interfaces/org.bluez.adapter.xml
@@ -1,13 +1,11 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-<!-- 
 	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 			<arg name="xml" type="s" direction="out" />
 		</method>
 	</interface>
- -->
 	<interface name="org.bluez.Adapter1">
 		<method name="StartDiscovery"></method>
 		<method name="SetDiscoveryFilter">
@@ -85,4 +83,4 @@
 			<arg name="uuid" type="s" direction="in" />
 		</method>
 	</interface>
-</node>
\ No newline at end of file
+</node>
diff --git a/src/interfaces/org.bluez.device.xml b/src/interfaces/org.bluez.device.xml
index 7715379..468ea40 100644
--- a/src/interfaces/org.bluez.device.xml
+++ b/src/interfaces/org.bluez.device.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node>
-<!-- 
 	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 			<arg name="xml" type="s" direction="out" />
 		</method>
 	</interface>
--->
 	<interface name="org.bluez.Device1">
 		<method name="Disconnect">
             <annotation name="org.freedesktop.DBus.GLib.Async"/>
@@ -109,4 +107,4 @@
 		<property name="Connected" type="b" access="read"></property>
 		<property name="Player" type="o" access="read"></property>
 	</interface>
-</node>
\ No newline at end of file
+</node>
diff --git a/src/interfaces/org.bluez.manager.xml b/src/interfaces/org.bluez.manager.xml
index 5c16ffa..8f2190c 100644
--- a/src/interfaces/org.bluez.manager.xml
+++ b/src/interfaces/org.bluez.manager.xml
@@ -1,13 +1,11 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-<!-- 
 	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 			<arg name="xml" type="s" direction="out" />
 		</method>
 	</interface>
- -->
 	<interface name="org.bluez.AgentManager1">
 		<method name="RegisterAgent">
 			<arg name="agent" type="o" direction="in" />
@@ -40,4 +38,4 @@
 		</method>
 	</interface>
 	<node name="hci0" />
-</node>
\ No newline at end of file
+</node>
diff --git a/src/interfaces/org.bluez.obex.Agent1.xml b/src/interfaces/org.bluez.obex.Agent1.xml
index e7a0289..9f1e027 100644
--- a/src/interfaces/org.bluez.obex.Agent1.xml
+++ b/src/interfaces/org.bluez.obex.Agent1.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://github.com/r10r/bluez/blob/master/doc/obex-agent-api.txt -->
 <node name="/org/trinitydesktop/tdeobex">
-<!--	<interface name="org.freedesktop.DBus.Introspectable">
+	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 		<arg name="xml" type="s" direction="out"/>
 		</method>
 	</interface>
--->
 	<interface name="org.bluez.obex.Agent1">
 		<method name="Release">
             <annotation name="org.freedesktop.DBus.GLib.Async"/>
diff --git a/src/interfaces/org.bluez.obex.client.xml b/src/interfaces/org.bluez.obex.client.xml
index 1eadf29..749fb18 100644
--- a/src/interfaces/org.bluez.obex.client.xml
+++ b/src/interfaces/org.bluez.obex.client.xml
@@ -2,13 +2,11 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <!-- https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc/obex-api.txt -->
 <node name="/org/bluez/obex">
-<!--
 	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 			<arg name="xml" type="s" direction="out"/>
 		</method>
 	</interface>
--->
 	<interface name="org.bluez.obex.AgentManager1">
 		<method name="RegisterAgent">
 			<arg name="agent" type="o" direction="in" />
@@ -198,4 +196,4 @@
             <arg name="invalidated_properties" type="as" />
         </signal>
     </interface>
-</node>
\ No newline at end of file
+</node>
diff --git a/src/interfaces/org.freedesktop.DBus.ObjectManager.xml b/src/interfaces/org.freedesktop.DBus.ObjectManager.xml
index cf73bea..0d14f97 100644
--- a/src/interfaces/org.freedesktop.DBus.ObjectManager.xml
+++ b/src/interfaces/org.freedesktop.DBus.ObjectManager.xml
@@ -1,13 +1,11 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-<!--
 	<interface name="org.freedesktop.DBus.Introspectable">
 		<method name="Introspect">
 			<arg name="xml" type="s" direction="out" />
 		</method>
 	</interface>
--->
 	<interface name="org.freedesktop.DBus.ObjectManager">
 		<method name="GetManagedObjects">
 			<arg name="objects" type="a{oa{sa{sv}}}" direction="out" />
@@ -21,4 +19,4 @@
 			<arg name="interfaces" type="as" />
 		</signal>
 	</interface>
-</node>
\ No newline at end of file
+</node>
diff --git a/src/interfaces/org.tdebluez.agent.xml b/src/interfaces/org.tdebluez.agent.xml
index 36bac01..d4fbd48 100644
--- a/src/interfaces/org.tdebluez.agent.xml
+++ b/src/interfaces/org.tdebluez.agent.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/org/trinitydesktop/tdebluez">
-<!--  The Introspectable Interface gets autogenerated 
-   <interface name="org.freedesktop.DBus.Introspectable">
-     <method name="Introspect">
-       <arg name="xml" type="s" direction="out"/>
-     </method>
-   </interface>
--->
+	<interface name="org.freedesktop.DBus.Introspectable">
+		<method name="Introspect">
+			<arg name="xml" type="s" direction="out" />
+		</method>
+	</interface>
 	<interface name="org.bluez.Agent1">
 		<method name="Release">
 		</method>