>From 1284630c986b1d478856ede690daf31c81fe94b8 Mon Sep 17 00:00:00 2001
From: David Pirotte <address@hidden>
Date: Sun, 7 Jun 2015 19:07:43 -0300
Subject: [PATCH 2/2] Test-suite:  Update for new API forms.

Notes:

(1)  Most of the test-suite API files listed as part of this commit
should actually have been updated prior to release 2.16.2, as a
consequence of the following changes that were made (this is what I
have identified, but may not be exactly complete, see the logs if you
are intersted in further information about what pertains, wrt API
changes, to 2.16.2 and the near future 2.16.3 release:

	add <gparam-gtype>				[ 2b9b0c7
	add GObjectClass* wrapset type			[ 55db8f8
	add cairo_path_t g-wrap wrapper 		[ e78bf49
	fix wrappers for gtk_action_group_add_*()	[ 0ca1b78
	fix const-gchar** args				[ 8f23305
	fix addition of methods to generics from
	(gnome gobject generics)			[ 52fae2f

(2)  Test-suite updates for new API forms wrt the work being done since
the 2.16.2 release are a consequence of:

	<guchar*>, <guint8*>, <gunichar*>, <gunichar2*>: opaque
	pointer types added;

	g-ucs4-to-utf16, g-ucs4-to-utf8, g-utf16-to-ucs4,
	g-utf16-to-utf8, g-utf8-to-ucs4, g-utf8-to-utf16,
	gdk-pixbuf-get-pixels: procedure wrappers added

	gtk-recent-info-get-application-info: declared as ignored, it
	was actually not wrapped properly.

* atk/tests/wrapset.api:
* corba/tests/wrapset.api:
* gconf/tests/wrapset.api:
* glib/test-suite/gobject.api:
* glib/test-suite/wrapset.api:
* gnome-vfs/tests/wrapset.api:
* gtk/tests/gdk/wrapset.api:
* gtk/tests/gtk/wrapset.api:
* libglade/tests/wrapset.api:
* libgnome/tests/wrapset.api:
* libgnomecanvas/tests/wrapset.api:
* libgnomeui/tests/wrapset.api:
* pango/tests/pango/wrapset.api:
* pango/tests/pangocairo/wrapset.api:  All test-suite API files being
  updated as a consequence of (1) and/or (2)
---
 atk/tests/wrapset.api              |  7 ++++-
 corba/tests/wrapset.api            |  7 ++++-
 gconf/tests/wrapset.api            |  7 ++++-
 glib/test-suite/gobject.api        | 22 +++++++++++++---
 glib/test-suite/wrapset.api        | 19 ++++++++++++--
 gnome-vfs/tests/wrapset.api        |  7 ++++-
 gtk/tests/gdk/wrapset.api          | 24 +++++++++++-------
 gtk/tests/gtk/wrapset.api          | 52 ++++++++++++++++++++++++++------------
 libglade/tests/wrapset.api         | 21 ++++++++++++---
 libgnome/tests/wrapset.api         |  7 ++++-
 libgnomecanvas/tests/wrapset.api   | 28 +++++++++++++++++---
 libgnomeui/tests/wrapset.api       | 24 +++++++++++++++---
 pango/tests/pango/wrapset.api      | 11 +++++---
 pango/tests/pangocairo/wrapset.api | 33 ++++++++++++++----------
 14 files changed, 207 insertions(+), 62 deletions(-)

diff --git a/atk/tests/wrapset.api b/atk/tests/wrapset.api
index bb5dd1e..85cb8da 100644
--- a/atk/tests/wrapset.api
+++ b/atk/tests/wrapset.api
@@ -10,7 +10,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
diff --git a/corba/tests/wrapset.api b/corba/tests/wrapset.api
index 8540409..d60cb76 100644
--- a/corba/tests/wrapset.api
+++ b/corba/tests/wrapset.api
@@ -103,7 +103,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
diff --git a/gconf/tests/wrapset.api b/gconf/tests/wrapset.api
index a9d9615..8f4583b 100644
--- a/gconf/tests/wrapset.api
+++ b/gconf/tests/wrapset.api
@@ -10,7 +10,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
diff --git a/glib/test-suite/gobject.api b/glib/test-suite/gobject.api
index 6eefc5e..109d460 100644
--- a/glib/test-suite/gobject.api
+++ b/glib/test-suite/gobject.api
@@ -1,5 +1,14 @@
 (module-api
   (version 1 0)
+  ((gnome gobject)
+   (uses-interfaces
+     (gnome gobject gclosure)
+     (gnome gobject gobject)
+     (gnome gobject gparameter)
+     (gnome gobject gsignal)
+     (gnome gobject gtype)
+     (gnome gobject gvalue))
+   (typed-exports))
   ((gnome gobject gclosure)
    (uses-interfaces)
    (typed-exports
@@ -12,7 +21,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -65,6 +79,7 @@
      (<gparam-enum> class)
      (<gparam-flags> class)
      (<gparam-float> class)
+     (<gparam-gtype> class)
      (<gparam-int64> class)
      (<gparam-int> class)
      (<gparam-long> class)
@@ -119,7 +134,7 @@
        (arity 3 2 #f))
      (gtype-instance-signal-connect-after
        procedure
-       (arity 3 0 #f))
+       (arity 3 1 #f))
      (gtype-instance-signal-emit
        procedure
        (arity 2 0 #t))))
@@ -277,4 +292,5 @@
    (uses-interfaces)
    (typed-exports
      (export-all-lazy! procedure (arity 1 0 #f))
-     (re-export-modules macro))))
+     (re-export-modules macro)))
+  ((gnome-2) (uses-interfaces) (typed-exports)))
diff --git a/glib/test-suite/wrapset.api b/glib/test-suite/wrapset.api
index 0c6f09e..1ce2fd4 100644
--- a/glib/test-suite/wrapset.api
+++ b/glib/test-suite/wrapset.api
@@ -19,7 +19,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -45,6 +50,10 @@
    (uses-interfaces (gnome gw generics))
    (typed-exports
      (<g-string*> <gw:wct>)
+     (<guchar*> <gw:wct>)
+     (<guint8*> <gw:wct>)
+     (<gunichar*> <gw:wct>)
+     (<gunichar2*> <gw:wct>)
      (enum-<g-bookmark-file-error>-val->int
        procedure
        (arity 1 0 #f))
@@ -362,11 +371,13 @@
      (g-string-get-str procedure (arity 0 0 #t))
      (g-string-new procedure (arity 0 1 #f))
      (g-timeout-source-new procedure (arity 0 0 #t))
+     (g-ucs4-to-utf16 procedure (arity 1 0 #f))
+     (g-ucs4-to-utf8 procedure (arity 1 0 #f))
      (g-unichar-break-type procedure (arity 0 0 #t))
      (g-unichar-digit-value procedure (arity 0 0 #t))
      (g-unichar-get-mirror-char
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (g-unichar-isalnum procedure (arity 0 0 #t))
      (g-unichar-isalpha procedure (arity 0 0 #t))
      (g-unichar-iscntrl procedure (arity 0 0 #t))
@@ -389,6 +400,8 @@
      (g-unichar-type procedure (arity 0 0 #t))
      (g-unichar-validate procedure (arity 0 0 #t))
      (g-unichar-xdigit-value procedure (arity 0 0 #t))
+     (g-utf16-to-ucs4 procedure (arity 1 0 #f))
+     (g-utf16-to-utf8 procedure (arity 1 0 #f))
      (g-utf8-casefold procedure (arity 0 0 #t))
      (g-utf8-collate procedure (arity 0 0 #t))
      (g-utf8-collate-key procedure (arity 0 0 #t))
@@ -404,4 +417,6 @@
      (g-utf8-strrchr procedure (arity 0 0 #t))
      (g-utf8-strreverse procedure (arity 0 0 #t))
      (g-utf8-strup procedure (arity 0 0 #t))
+     (g-utf8-to-ucs4 procedure (arity 1 0 #f))
+     (g-utf8-to-utf16 procedure (arity 1 0 #f))
      (g-utf8-validate procedure (arity 0 0 #t)))))
diff --git a/gnome-vfs/tests/wrapset.api b/gnome-vfs/tests/wrapset.api
index 82fbcbc..f2047de 100644
--- a/gnome-vfs/tests/wrapset.api
+++ b/gnome-vfs/tests/wrapset.api
@@ -7,7 +7,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
diff --git a/gtk/tests/gdk/wrapset.api b/gtk/tests/gdk/wrapset.api
index ac9a194..2bb6b99 100644
--- a/gtk/tests/gdk/wrapset.api
+++ b/gtk/tests/gdk/wrapset.api
@@ -7,7 +7,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -1410,18 +1415,18 @@
      (gdk-bitmap-create-from-data
        procedure
        (arity 0 0 #t))
-     (gdk-cairo-create procedure (arity 1 0 #f))
-     (gdk-cairo-rectangle procedure (arity 2 0 #f))
-     (gdk-cairo-region procedure (arity 2 0 #f))
+     (gdk-cairo-create procedure (arity 0 0 #t))
+     (gdk-cairo-rectangle procedure (arity 0 0 #t))
+     (gdk-cairo-region procedure (arity 0 0 #t))
      (gdk-cairo-set-source-color
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (gdk-cairo-set-source-pixbuf
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (gdk-cairo-set-source-pixmap
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (gdk-char-height procedure (arity 0 0 #t))
      (gdk-char-measure procedure (arity 0 0 #t))
      (gdk-char-width procedure (arity 0 0 #t))
@@ -1788,6 +1793,7 @@
        procedure
        (arity 0 0 #t))
      (gdk-pixbuf-get-option procedure (arity 0 0 #t))
+     (gdk-pixbuf-get-pixels procedure (arity 0 0 #t))
      (gdk-pixbuf-get-rowstride
        procedure
        (arity 0 0 #t))
@@ -1919,7 +1925,7 @@
      (gdk-screen-get-display procedure (arity 0 0 #t))
      (gdk-screen-get-font-options
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (gdk-screen-get-height procedure (arity 0 0 #t))
      (gdk-screen-get-height-mm
        procedure
@@ -1988,7 +1994,7 @@
        (arity 0 0 #t))
      (gdk-screen-set-font-options
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (gdk-screen-set-resolution
        procedure
        (arity 0 0 #t))
diff --git a/gtk/tests/gtk/wrapset.api b/gtk/tests/gtk/wrapset.api
index 7f403fd..5d17bc2 100644
--- a/gtk/tests/gtk/wrapset.api
+++ b/gtk/tests/gtk/wrapset.api
@@ -7,7 +7,17 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtk-accel-group>
+         <integer>
+         <top>
+         <top>
+         <gclosure>)
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -15,11 +25,16 @@
      (create-signal
        generic
        (<gtype-class> <symbol> <top> <top>))
-     (disconnect generic (<gtype-instance> <top>))
+     (disconnect
+       generic
+       (<gtk-accel-group> <gclosure>)
+       (<gtype-instance> <top>))
      (emit generic
            (<gtype-instance> <symbol> . <top>))
      (find-property generic (<gtype-class> <symbol>))
-     (get generic (<gobject> <symbol>))
+     (get generic
+          (<gobject> <symbol>)
+          (<gtk-print-settings> <string>))
      (get-properties generic (<gtype-class>))
      (get-property-names generic (<gtype-class>))
      (get-signals generic (<gtype-class>))
@@ -72,18 +87,18 @@
      (gdk-bitmap-create-from-data
        procedure
        (arity 0 0 #t))
-     (gdk-cairo-create procedure (arity 1 0 #f))
-     (gdk-cairo-rectangle procedure (arity 2 0 #f))
-     (gdk-cairo-region procedure (arity 2 0 #f))
+     (gdk-cairo-create procedure (arity 0 0 #t))
+     (gdk-cairo-rectangle procedure (arity 0 0 #t))
+     (gdk-cairo-region procedure (arity 0 0 #t))
      (gdk-cairo-set-source-color
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (gdk-cairo-set-source-pixbuf
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (gdk-cairo-set-source-pixmap
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (gdk-char-height procedure (arity 0 0 #t))
      (gdk-char-measure procedure (arity 0 0 #t))
      (gdk-char-width procedure (arity 0 0 #t))
@@ -450,6 +465,7 @@
        procedure
        (arity 0 0 #t))
      (gdk-pixbuf-get-option procedure (arity 0 0 #t))
+     (gdk-pixbuf-get-pixels procedure (arity 0 0 #t))
      (gdk-pixbuf-get-rowstride
        procedure
        (arity 0 0 #t))
@@ -581,7 +597,7 @@
      (gdk-screen-get-display procedure (arity 0 0 #t))
      (gdk-screen-get-font-options
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (gdk-screen-get-height procedure (arity 0 0 #t))
      (gdk-screen-get-height-mm
        procedure
@@ -650,7 +666,7 @@
        (arity 0 0 #t))
      (gdk-screen-set-font-options
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (gdk-screen-set-resolution
        procedure
        (arity 0 0 #t))
@@ -925,9 +941,13 @@
      (%gtk-message-dialog-new
        procedure
        (arity 1 4 #f))
+     (<gtk-accel-group> class)
+     (<gtk-alignment> class)
+     (<gtk-arrow> class)
      (<gtk-binding-set*> <gw:wct>)
      (<gtk-list-store> class)
      (<gtk-object> class)
+     (<gtk-print-settings> class)
      (<gtk-radio-group*> <gw:wct>)
      (<gtk-text-buffer> class)
      (<gtk-tree-iter> class)
@@ -3410,7 +3430,7 @@
        (arity 0 0 #t))
      (gtk-print-context-get-cairo-context
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (gtk-print-context-get-dpi-x
        procedure
        (arity 0 0 #t))
@@ -3431,7 +3451,7 @@
        (arity 0 0 #t))
      (gtk-print-context-set-cairo-context
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (gtk-print-error-quark procedure (arity 0 0 #t))
      (gtk-print-operation-cancel
        procedure
@@ -4003,9 +4023,6 @@
      (gtk-recent-info-get-age
        procedure
        (arity 0 0 #t))
-     #;(gtk-recent-info-get-application-info
-       procedure
-       (arity 2 0 #f))
      (gtk-recent-info-get-description
        procedure
        (arity 0 0 #t))
@@ -5746,6 +5763,9 @@
      (gtk-tree-view-get-model
        procedure
        (arity 0 0 #t))
+     (gtk-tree-view-get-path-at-pos
+       procedure
+       (arity 0 0 #t))
      (gtk-tree-view-get-reorderable
        procedure
        (arity 0 0 #t))
diff --git a/libglade/tests/wrapset.api b/libglade/tests/wrapset.api
index 1421ea3..6f25630 100644
--- a/libglade/tests/wrapset.api
+++ b/libglade/tests/wrapset.api
@@ -10,7 +10,17 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtk-accel-group>
+         <integer>
+         <top>
+         <top>
+         <gclosure>)
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -18,11 +28,16 @@
      (create-signal
        generic
        (<gtype-class> <symbol> <top> <top>))
-     (disconnect generic (<gtype-instance> <top>))
+     (disconnect
+       generic
+       (<gtk-accel-group> <gclosure>)
+       (<gtype-instance> <top>))
      (emit generic
            (<gtype-instance> <symbol> . <top>))
      (find-property generic (<gtype-class> <symbol>))
-     (get generic (<gobject> <symbol>))
+     (get generic
+          (<gobject> <symbol>)
+          (<gtk-print-settings> <string>))
      (get-properties generic (<gtype-class>))
      (get-property-names generic (<gtype-class>))
      (get-signals generic (<gtype-class>))
diff --git a/libgnome/tests/wrapset.api b/libgnome/tests/wrapset.api
index ed420c6..d715fff 100644
--- a/libgnome/tests/wrapset.api
+++ b/libgnome/tests/wrapset.api
@@ -11,7 +11,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
diff --git a/libgnomecanvas/tests/wrapset.api b/libgnomecanvas/tests/wrapset.api
index 3bde199..03865ed 100644
--- a/libgnomecanvas/tests/wrapset.api
+++ b/libgnomecanvas/tests/wrapset.api
@@ -10,7 +10,17 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtk-accel-group>
+         <integer>
+         <top>
+         <top>
+         <gclosure>)
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -18,16 +28,26 @@
      (create-signal
        generic
        (<gtype-class> <symbol> <top> <top>))
-     (disconnect generic (<gtype-instance> <top>))
+     (disconnect
+       generic
+       (<gtk-accel-group> <gclosure>)
+       (<gtype-instance> <top>))
      (emit generic
            (<gtype-instance> <symbol> . <top>))
      (find-property generic (<gtype-class> <symbol>))
-     (get generic (<gobject> <symbol>))
+     (get generic
+          (<gobject> <symbol>)
+          (<gtk-print-settings> <string>))
      (get-properties generic (<gtype-class>))
      (get-property-names generic (<gtype-class>))
      (get-signals generic (<gtype-class>))
      (invoke generic (<gclosure> . <top>))
-     (set generic (<gobject> <symbol> <top>))
+     (set generic
+          (<gobject> <symbol> <top>)
+          (<gtk-alignment> <real> <real> <real> <real>)
+          (<gtk-arrow> <top> <top>)
+          (<gtk-aspect-frame> . <top>)
+          (<gtk-print-settings> <string> <string>))
      (unblock generic (<gtype-instance> <top>))))
   ((gnome gw canvas)
    (uses-interfaces (gnome gw generics))
diff --git a/libgnomeui/tests/wrapset.api b/libgnomeui/tests/wrapset.api
index fe2f7ba..3968d5d 100644
--- a/libgnomeui/tests/wrapset.api
+++ b/libgnomeui/tests/wrapset.api
@@ -10,7 +10,18 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gnome-client>)
+       (<gtk-accel-group>
+         <integer>
+         <top>
+         <top>
+         <gclosure>)
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -18,11 +29,17 @@
      (create-signal
        generic
        (<gtype-class> <symbol> <top> <top>))
-     (disconnect generic (<gtype-instance> <top>))
+     (disconnect
+       generic
+       (<gnome-client>)
+       (<gtk-accel-group> <gclosure>)
+       (<gtype-instance> <top>))
      (emit generic
            (<gtype-instance> <symbol> . <top>))
      (find-property generic (<gtype-class> <symbol>))
-     (get generic (<gobject> <symbol>))
+     (get generic
+          (<gobject> <symbol>)
+          (<gtk-print-settings> <string>))
      (get-properties generic (<gtype-class>))
      (get-property-names generic (<gtype-class>))
      (get-signals generic (<gtype-class>))
@@ -42,6 +59,7 @@
   ((gnome gw libgnomeui)
    (uses-interfaces (gnome gw generics))
    (typed-exports
+     (<gnome-client> class)
      (gnome-authentication-manager-dialog-is-visible
        procedure
        (arity 0 0 #t))
diff --git a/pango/tests/pango/wrapset.api b/pango/tests/pango/wrapset.api
index 9554134..f697fb3 100644
--- a/pango/tests/pango/wrapset.api
+++ b/pango/tests/pango/wrapset.api
@@ -7,7 +7,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -292,7 +297,7 @@
      (pango-font-metrics-get-underline-thickness
        procedure
        (arity 0 0 #t))
-     (pango-get-mirror-char procedure (arity 1 0 #f))
+     (pango-get-mirror-char procedure (arity 0 0 #t))
      (pango-glyph-string-copy
        procedure
        (arity 0 0 #t))
@@ -473,7 +478,7 @@
        (arity 0 0 #t))
      (pango-layout-set-markup-with-accel
        procedure
-       (arity 4 0 #f))
+       (arity 0 0 #t))
      (pango-layout-set-single-paragraph-mode
        procedure
        (arity 0 0 #t))
diff --git a/pango/tests/pangocairo/wrapset.api b/pango/tests/pangocairo/wrapset.api
index 5ca5c09..a37d1b0 100644
--- a/pango/tests/pangocairo/wrapset.api
+++ b/pango/tests/pangocairo/wrapset.api
@@ -7,7 +7,12 @@
      (connect
        generic
        <top>
-       (<gtype-instance> <symbol> <procedure>))
+       (<gtype-instance> <symbol> <procedure>)
+       (<gtype-instance>
+         <symbol>
+         <procedure>
+         <boolean>
+         <symbol>))
      (connect-after
        generic
        (<gtype-instance> <symbol> <procedure>))
@@ -34,22 +39,22 @@
    (typed-exports
      (pango-cairo-context-get-font-options
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-context-get-resolution
        procedure
        (arity 0 0 #t))
      (pango-cairo-context-set-font-options
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-context-set-resolution
        procedure
        (arity 0 0 #t))
      (pango-cairo-create-layout
        procedure
-       (arity 1 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-error-underline-path
        procedure
-       (arity 5 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-font-map-create-context
        procedure
        (arity 0 0 #t))
@@ -67,28 +72,28 @@
        (arity 0 0 #t))
      (pango-cairo-glyph-string-path
        procedure
-       (arity 3 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-layout-line-path
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-layout-path
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-show-error-underline
        procedure
-       (arity 5 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-show-glyph-string
        procedure
-       (arity 3 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-show-layout
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-show-layout-line
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-update-context
        procedure
-       (arity 2 0 #f))
+       (arity 0 0 #t))
      (pango-cairo-update-layout
        procedure
-       (arity 2 0 #f)))))
+       (arity 0 0 #t)))))
-- 
2.1.4