summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-01-04 11:40:11 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-01-04 12:15:20 +0000
commitb2094fece93d4cd9c32a8504f9c34bfc70660b3a (patch)
treed59d8701f439a145c66a804fb7435c2fdd81497d /extensions
parent764b9675887917a6f430b2ae9186714aa689bc65 (diff)
Update doc-generator from telepathy-glib master
This adds more checks, so add Connection_Status to all.xml, and specifically allow references to interfaces from telepathy-spec.
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Makefile.am4
-rw-r--r--extensions/all.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 7cb835bf..1e0fcced 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -50,7 +50,9 @@ _gen/%.xml: %.xml $(wildcard *.xml) $(tools_dir)/identity.xsl
$< > $@
extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ --param allow-undefined-interfaces 'true()' \
+ --xinclude \
$(tools_dir)/doc-generator.xsl \
$< > $@
diff --git a/extensions/all.xml b/extensions/all.xml
index 436272cd..befed66d 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -53,6 +53,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
from="Telepathy specification"/>
<tp:external-type name="Channel_Class" type="a{sv}"
from="Telepathy specification"/>
+ <tp:external-type name="Connection_Status" type="u"
+ from="Telepathy specification"/>
<!-- use types from Channel_Type_Tubes -->
<tp:external-type name="DBus_Tube_Member" type="(us)"