Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge

Tag 1_39_90

Conflicts:
	autogen.sh
	configure.ac

1 files changed, 55 insertions, 0 deletions

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
new file mode 100644
index 00000000..c7e03ace
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect.add"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    
+    <link xref="Regress.FooBRect" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_foo_brect_add</api:name>
+      <api:arg>
+        <api:type>Regress.FooBRect</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>Regress.FooBRect</api:type>
+        <api:name>b2</api:name>
+      </api:arg>
+    </api:function>
+
+  </info>
+  <title>Regress.FooBRect.add</title>
+  
+<synopsis><code mime="text/x-python">
+@accepts(Regress.FooBRect, Regress.FooBRect)
+@returns(none)
+def add(self, b2):
+    # Python wrapper for regress_foo_brect_add()
+</code></synopsis>
+
+  
+    
+  
+  
+  
+  
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>b2</code></title>
+
+</item>
+</terms>
+
+  
+  
+</page>