Bug 552568 - All the argv parameters in Gtk.gir map char*** to int8

svn path=/trunk/; revision=939

4 files changed, 93 insertions, 0 deletions

diff --git a/tests/scanner/annotation-1.0-expected.gir b/tests/scanner/annotation-1.0-expected.gir
index 33fb370e..5f8102e3 100644
--- a/tests/scanner/annotation-1.0-expected.gir
+++ b/tests/scanner/annotation-1.0-expected.gir
@@ -212,6 +212,21 @@
           </parameter>
         </parameters>
       </method>
+      <method name="parse_args" c:identifier="annotation_object_parse_args">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="argc" direction="inout" transfer-ownership="full">
+            <type name="int" c:type="int*"/>
+          </parameter>
+          <parameter name="argv" direction="inout" transfer-ownership="none">
+            <array length="1" c:type="char***">
+              <type name="utf8"/>
+            </array>
+          </parameter>
+        </parameters>
+      </method>
       <method name="do_not_use"
               c:identifier="annotation_object_do_not_use"
               deprecated="Use annotation_object_create_object() instead."
@@ -229,5 +244,20 @@
         <type name="GObject.ObjectClass" c:type="GObjectClass"/>
       </field>
     </record>
+    <function name="init" c:identifier="annotation_init">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc" direction="inout" transfer-ownership="full">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv" direction="inout" transfer-ownership="none">
+          <array length="0" c:type="char***">
+            <type name="utf8"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
   </namespace>
 </repository>
diff --git a/tests/scanner/annotation-1.0-expected.tgir b/tests/scanner/annotation-1.0-expected.tgir
index 9a50dd94..4728f8df 100644
--- a/tests/scanner/annotation-1.0-expected.tgir
+++ b/tests/scanner/annotation-1.0-expected.tgir
@@ -201,6 +201,21 @@
           </parameter>
         </parameters>
       </method>
+      <method name="parse_args" c:identifier="annotation_object_parse_args">
+        <return-value transfer-ownership="none">
+          <type name="none"/>
+        </return-value>
+        <parameters>
+          <parameter name="argc" transfer-ownership="full" direction="inout">
+            <type name="int"/>
+          </parameter>
+          <parameter name="argv" transfer-ownership="none" direction="inout">
+            <array length="1" zero-terminated="1">
+              <type name="utf8"/>
+            </array>
+          </parameter>
+        </parameters>
+      </method>
       <method name="do_not_use" c:identifier="annotation_object_do_not_use" deprecated="1">
         <return-value transfer-ownership="full">
           <type name="GObject.Object"/>
@@ -212,5 +227,20 @@
         <type name="GObject.ObjectClass"/>
       </field>
     </record>
+    <function name="init" c:identifier="annotation_init">
+      <return-value transfer-ownership="none">
+        <type name="none"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc" transfer-ownership="full" direction="inout">
+          <type name="int"/>
+        </parameter>
+        <parameter name="argv" transfer-ownership="none" direction="inout">
+          <array length="0" zero-terminated="1">
+            <type name="utf8"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
   </namespace>
 </repository>
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index e4c44e13..3a67a01a 100644
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -258,6 +258,22 @@ annotation_object_compute_sum_nz(AnnotationObject *object,
 }
 
 /**
+ * annotation_object_parse_args:
+ * @object: a #AnnotationObject
+ * @argc: (inout): Length of the argument vector
+ * @argv: (inout) (array length=argc zero-terminated=1): Argument vector
+ *
+ * Test taking a zero-terminated array with length parameter
+ **/
+void
+annotation_object_parse_args(AnnotationObject *object,
+                             int              *argc,
+                             char           ***argv)
+{
+
+}
+
+/**
  * annotation_object_allow_none:
  * @object: a #GObject
  * @somearg: (allow-none):
@@ -293,4 +309,16 @@ annotation_object_do_not_use (AnnotationObject *object)
   return NULL;
 }
 
+/**
+ * annotation_init:
+ * @argc: (inout): The number of args. 
+ * @argv: (inout) (array length=argc zero-terminated=1): The arguments.
+ **/
+void
+annotation_init (int *argc, char ***argv)
+{
+
+}
+
+
 static char backslash_parsing_tester_2 = '\\';
diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h
index 23a5c6b3..116b881d 100644
--- a/tests/scanner/annotation.h
+++ b/tests/scanner/annotation.h
@@ -69,8 +69,13 @@ void     annotation_object_compute_sum_n(AnnotationObject *object,
 void     annotation_object_compute_sum_nz(AnnotationObject *object,
                                           int             *nums,
                                           int              n_nums);
+void     annotation_object_parse_args   (AnnotationObject *object,
+                                         int              *argc,
+                                         char           ***argv);
 
 GObject* annotation_object_do_not_use   (AnnotationObject *object);
 
 
+void     annotation_init (int *argc, char ***argv);
+
 #endif /* __ANNOTATION_OBJECT_H__ */