luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Don't output invalid empty <variablelist> tags

Browse Source 
Docbook doesn't allow an empty <variablelist> and so the docbook
output from gdbus-codegen is invalid when a method/signal has
no arguments.

https://bugzilla.gnome.org/show_bug.cgi?id=692865
This commit is contained in:
Stef Walter 2013-01-30 11:07:52 +01:00
parent a60014f1b6
commit 11e208f9d6
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gio/gdbus-2.0/codegen/codegen_docbook.py
View File

@ -173,18 +173,19 @@ class DocbookCodeGenerator:
self.print_method_prototype(i, m, in_synopsis=False) self.print_method_prototype(i, m, in_synopsis=False)
self.out.write('</programlisting>\n') self.out.write('</programlisting>\n')
self.out.write('<para>%s</para>\n'%(self.expand(m.doc_string, True))) self.out.write('<para>%s</para>\n'%(self.expand(m.doc_string, True)))
self.out.write('<variablelist role="params">\n') if m.in_args or m.out_args:
for a in m.in_args: self.out.write('<variablelist role="params">\n')
self.out.write('<varlistentry>\n'%()) for a in m.in_args:
self.out.write(' <term><literal>IN %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name)) self.out.write('<varlistentry>\n'%())
self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True))) self.out.write(' <term><literal>IN %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
self.out.write('</varlistentry>\n'%()) self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
for a in m.out_args: self.out.write('</varlistentry>\n'%())
self.out.write('<varlistentry>\n'%()) for a in m.out_args:
self.out.write(' <term><literal>OUT %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name)) self.out.write('<varlistentry>\n'%())
self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True))) self.out.write(' <term><literal>OUT %s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
self.out.write('</varlistentry>\n'%()) self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
self.out.write('</variablelist>\n') self.out.write('</varlistentry>\n'%())
self.out.write('</variablelist>\n')
if len(m.since) > 0: if len(m.since) > 0:
self.out.write('<para role="since">Since %s</para>\n'%(m.since)) self.out.write('<para role="since">Since %s</para>\n'%(m.since))
if m.deprecated: if m.deprecated:
@ -199,13 +200,14 @@ class DocbookCodeGenerator:
self.print_signal_prototype(i, s, in_synopsis=False) self.print_signal_prototype(i, s, in_synopsis=False)
self.out.write('</programlisting>\n') self.out.write('</programlisting>\n')
self.out.write('<para>%s</para>\n'%(self.expand(s.doc_string, True))) self.out.write('<para>%s</para>\n'%(self.expand(s.doc_string, True)))
self.out.write('<variablelist role="params">\n') if s.args:
for a in s.args: self.out.write('<variablelist role="params">\n')
self.out.write('<varlistentry>\n'%()) for a in s.args:
self.out.write(' <term><literal>%s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name)) self.out.write('<varlistentry>\n'%())
self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True))) self.out.write(' <term><literal>%s <parameter>%s</parameter></literal>:</term>\n'%(a.signature, a.name))
self.out.write('</varlistentry>\n'%()) self.out.write(' <listitem><para>%s</para></listitem>\n'%(self.expand(a.doc_string, True)))
self.out.write('</variablelist>\n') self.out.write('</varlistentry>\n'%())
self.out.write('</variablelist>\n')
if len(s.since) > 0: if len(s.since) > 0:
self.out.write('<para role="since">Since %s</para>\n'%(s.since)) self.out.write('<para role="since">Since %s</para>\n'%(s.since))
if s.deprecated: if s.deprecated: