[geany/geany] 801698: Merge pull request #965 from kugel-/gi-fix-structs

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 19 Mar 2016 22:35:16 UTC
Commit:      801698ddeda2c682bf159a41b22f6475bb1c7a10
             https://github.com/geany/geany/commit/801698ddeda2c682bf159a41b22f6475bb1c7a10

Log Message:
-----------
Merge pull request #965 from kugel-/gi-fix-structs

gtkdoc: fix gtkdoc header script for structs with inline types


Modified Paths:
--------------
    scripts/gen-api-gtkdoc.py

Modified: scripts/gen-api-gtkdoc.py
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -292,9 +292,9 @@ class DoxyStruct(DoxyElement):
     @staticmethod
     def from_compounddef(xml, typedefs=[]):
         name = xml.find("compoundname").text
-        section = xml.find("sectiondef")
         d = "struct %s {\n" % name
-        for p in section.findall("memberdef"):
+        memberdefs = xml.xpath(".//sectiondef[@kind='public-attrib']/memberdef")
+        for p in memberdefs:
             # workaround for struct members. g-ir-scanner can't properly map struct members
             # (beginning with struct GeanyFoo) to the typedef and assigns a generic type for them
             # thus we fix that up here and enforce usage of the typedef. These are written
@@ -314,7 +314,7 @@ def from_compounddef(xml, typedefs=[]):
         d += "};\n"
         e = DoxyStruct(name, d)
         e.add_brief(xml.find("briefdescription"))
-        for p in section.findall("memberdef"):
+        for p in memberdefs:
             e.add_member(p)
         return e
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).