From c47d9239c169f80e66c335ec9ae45aa952a43ed8 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Sat, 1 Oct 2016 13:47:27 +0200
Subject: [PATCH 2/2] spec: Allow <annotation> in <arg> elements in
 introspection XML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is widely used in practice (especially by GLib — just look at files
in /usr/share/dbus-1/interfaces/), and there is no reason not to allow
it. Update the specification, introspection DTD and XSL file to allow
and represent it.

https://bugs.freedesktop.org/show_bug.cgi?id=86162
---
 doc/dbus-specification.xml | 2 +-
 doc/introspect.dtd         | 2 +-
 doc/introspect.xsl         | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index f57a498..9a237a6 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -4036,7 +4036,7 @@
       </itemizedlist>
     </para>
     <para>
-        Method, interface, property, and signal elements may have
+        Method, interface, property, signal, and argument elements may have
         "annotations", which are generic key/value pairs of metadata.
         They are similar conceptually to Java's annotations and C# attributes.
         Well-known annotations:
diff --git a/doc/introspect.dtd b/doc/introspect.dtd
index ba263d3..4d396f9 100644
--- a/doc/introspect.dtd
+++ b/doc/introspect.dtd
@@ -16,7 +16,7 @@
 <!ELEMENT signal (arg|annotation)*>
 <!ATTLIST signal name CDATA #REQUIRED>
 
-<!ELEMENT arg EMPTY>
+<!ELEMENT arg (annotation)*>
 <!ATTLIST arg name CDATA #IMPLIED>
 <!ATTLIST arg type CDATA #REQUIRED>
 <!-- Method arguments SHOULD include "direction",
diff --git a/doc/introspect.xsl b/doc/introspect.xsl
index 52604a5..89b6844 100644
--- a/doc/introspect.xsl
+++ b/doc/introspect.xsl
@@ -80,6 +80,12 @@
                       
                       <span class="type"><xsl:value-of select="@type"/></span><xsl:text> </xsl:text>
                       <span class="symbol"><xsl:value-of select="@name"/></span><xsl:text> </xsl:text>
+
+                      <xsl:if test="annotation">
+                        <ul>
+                          <xsl:apply-templates select="annotation"/>
+                        </ul>
+                      </xsl:if>
                     </li>
                   </xsl:for-each>
                 </ul>
-- 
2.7.4