[gobject-introspection] tests: Update expected gir for previous commits

[Colin Walters <walters src gnome org>]

commit 18bc8667e1a8d17300eada71a4c1d03d0e8e765a
Author: Colin Walters <walters verbum org>
Date:   Tue Sep 7 13:56:37 2010 -0400

    tests: Update expected gir for previous commits

 tests/scanner/Foo-1.0-expected.gir     |   44 ++++++++++++++++---------------
 tests/scanner/Regress-1.0-expected.gir |   28 ++++++++++++--------
 2 files changed, 40 insertions(+), 32 deletions(-)
---
diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir
index 105de42..731b0c0 100644
--- a/tests/scanner/Foo-1.0-expected.gir
+++ b/tests/scanner/Foo-1.0-expected.gir
@@ -576,27 +576,6 @@ uses a C sugar return type.</doc>
           </parameter>
         </parameters>
       </method>
-      <function name="new" c:identifier="foo_rectangle_new" introspectable="0">
-        <doc xml:whitespace="preserve">This is a C convenience constructor; we have to (skip)
-it because it's not a boxed type.</doc>
-        <return-value>
-          <type name="Rectangle" c:type="FooRectangle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="x" transfer-ownership="none">
-            <type name="gint" c:type="int"/>
-          </parameter>
-          <parameter name="y" transfer-ownership="none">
-            <type name="gint" c:type="int"/>
-          </parameter>
-          <parameter name="width" transfer-ownership="none">
-            <type name="gint" c:type="int"/>
-          </parameter>
-          <parameter name="height" transfer-ownership="none">
-            <type name="gint" c:type="int"/>
-          </parameter>
-        </parameters>
-      </function>
     </record>
     <constant name="SUCCESS_INT" value="4408">
       <type name="gint" c:type="gint"/>
@@ -941,6 +920,29 @@ exposed to language bindings.</doc>
         </parameter>
       </parameters>
     </function>
+    <function name="rectangle_new"
+              c:identifier="foo_rectangle_new"
+              introspectable="0">
+      <doc xml:whitespace="preserve">This is a C convenience constructor; we have to (skip)
+it because it's not a boxed type.</doc>
+      <return-value>
+        <type name="Rectangle" c:type="FooRectangle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="x" transfer-ownership="none">
+          <type name="gint" c:type="int"/>
+        </parameter>
+        <parameter name="y" transfer-ownership="none">
+          <type name="gint" c:type="int"/>
+        </parameter>
+        <parameter name="width" transfer-ownership="none">
+          <type name="gint" c:type="int"/>
+        </parameter>
+        <parameter name="height" transfer-ownership="none">
+          <type name="gint" c:type="int"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="skip_me" c:identifier="foo_skip_me" introspectable="0">
       <doc xml:whitespace="preserve">Does something that's only interesting from C and should not be
 exposed to language bindings.</doc>
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 4014e5e..8067b12 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -418,11 +418,6 @@ case.</doc>
           </parameter>
         </parameters>
       </method>
-      <method name="null_in" c:identifier="regress_test_obj_null_in">
-        <return-value transfer-ownership="none">
-          <type name="none" c:type="void"/>
-        </return-value>
-      </method>
       <method name="set_bare" c:identifier="regress_test_obj_set_bare">
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -643,12 +638,6 @@ case.</doc>
           </parameter>
         </parameters>
       </method>
-      <function name="const_return"
-                c:identifier="regress_test_simple_boxed_a_const_return">
-        <return-value transfer-ownership="none">
-          <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA*"/>
-        </return-value>
-      </function>
     </record>
     <record name="TestSimpleBoxedB"
             c:type="RegressTestSimpleBoxedB"
@@ -831,6 +820,17 @@ case.</doc>
         <type name="GObject.Object" c:type="GObject*"/>
       </field>
     </record>
+    <function name="func_obj_null_in" c:identifier="regress_func_obj_null_in">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="obj" transfer-ownership="none" allow-none="1">
+          <doc xml:whitespace="preserve">A #RegressTestObj</doc>
+          <type name="TestObj" c:type="RegressTestObj*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="set_abort_on_error"
               c:identifier="regress_set_abort_on_error">
       <return-value transfer-ownership="none">
@@ -1954,6 +1954,12 @@ call and can be released on return.</doc>
         </parameter>
       </parameters>
     </function>
+    <function name="test_simple_boxed_a_const_return"
+              c:identifier="regress_test_simple_boxed_a_const_return">
+      <return-value transfer-ownership="none">
+        <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA*"/>
+      </return-value>
+    </function>
     <function name="test_simple_callback"
               c:identifier="regress_test_simple_callback">
       <return-value transfer-ownership="none">