From 196da89bfbb5d02137969230cddf15609dc2ad5f Mon Sep 17 00:00:00 2001
From: unknown <jconnors@.ffaltd.ffa.co.uk>
Date: Thu, 12 Jun 2008 14:10:27 +0100
Subject: [PATCH] Updated girs Added an "unknown types" report.

---
 gir-loader.lisp                    |   23 +-
 gir-repository/gir/Makefile.am     |   12 +-
 gir-repository/gir/atk-1.0.gir     | 6316 ------------------------------------
 gir-repository/gir/cairo.gir       |   79 +-
 gir-repository/gir/gdk-x11-2.0.gir | 1012 ++++--
 gir-repository/gir/gtk-x11-2.0.gir | 5448 ++++++++++++++++++-------------
 gir-repository/gir/pango-1.0.gir   |  275 +-
 gir-tester.lisp                    |    7 +-
 8 files changed, 4237 insertions(+), 8935 deletions(-)
 delete mode 100644 gir-repository/gir/atk-1.0.gir

diff --git a/gir-loader.lisp b/gir-loader.lisp
index bc9bf43..825aedc 100644
--- a/gir-loader.lisp
+++ b/gir-loader.lisp
@@ -50,6 +50,8 @@
      (and (> type-string-len (length "Function"))
           (string= "FUNCTION" (string-upcase (subseq  type-string (- type-string-len (length "Function")))))))))
 
+(defparameter *unknown-types* nil)
+
 (defun resolve-type (type)
   (cond 
     ((null type) ":void")
@@ -60,12 +62,12 @@
        (if (or (null result) (symbolp result))
            (if (and  result (not (eql result :struct)))
                (format nil ":~A" result)
-             (progn
-               (if (not (eql result :struct))
-                   (format t ";; ~S possibly unknown~%" 
-                           (string (intern type))))
+             (let ((typestring (string (intern type))))
+               (unless (eql result :struct)
+				   (pushnew typestring *unknown-types*  :test 'equal)
+                   (format t ";; ~S possibly unknown~%"  typestring))														 
                (format nil "~A"
-                       (string  (intern  type)))))
+                       typestring)))
             (resolve-type result))))))
   
 ;; instead of this, why not use defctype?
@@ -97,6 +99,8 @@
 (add-type "GQuark" :uint32)
 (add-type "GdkAtom" :pointer)
 (add-type "Atom" :pointer)
+(add-type "GDestroyNotify" :pointer)
+(add-type "GCallback" :pointer)
 
 (defun parse-gir (gir-in)
   (s-xml:parse-xml gir-in :output-type :xml-struct))
@@ -106,11 +110,12 @@
     (parse-gir gir-in)))
 
 (defparameter *repository-names* '(
-								   "gtk-x11-2.0.gir"
-                                   "gdk-x11-2.0.gir"
-								   "atk-1.0.gir"
+;; 								   "gtk-x11-2.0.gir"
+;;                                    "gdk-x11-2.0.gir"
+;; 								   "atk-1.0.gir"
+;; 								   "pango-1.0.gir"
                                    "cairo.gir"
-								   "pango-1.0.gir"
+
 ))
 
 
diff --git a/gir-repository/gir/Makefile.am b/gir-repository/gir/Makefile.am
index 051341f..fad7567 100644
--- a/gir-repository/gir/Makefile.am
+++ b/gir-repository/gir/Makefile.am
@@ -30,7 +30,7 @@ GIRSOURCES += pango-1.0.gir
 # atk
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-atk-1.0.gir:
+atk.gir:
 	$(G_IR_SCANNER) -v --namespace Atk \
              --include=$(GIRDIR)/gobject-2.0.gir \
 	     --library=$(ATK_LIBDIR)/libatk-1.0.so.0 \
@@ -38,7 +38,7 @@ atk-1.0.gir:
              --pkg gobject-2.0 \
              -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
-GIRSOURCES += atk-1.0.gir
+GIRSOURCES += atk.gir
 
 # gdk
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
@@ -48,12 +48,12 @@ gdk-x11-2.0.gir:
              --include=$(GIRDIR)/gobject-2.0.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/pango-1.0.gir \
-             --include=$(srcdir)/atk-1.0.gir \
+             --include=$(srcdir)/atk.gir \
 	     --library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
              --output $@ \
              --pkg gobject-2.0 \
              --pkg cairo \
-             --pkg atk-1.0 \
+             --pkg atk \
              --pkg pango-1.0 \
              --pkg gdk-2.0 \
              -I$(GDK_INCLUDEDIR) \
@@ -68,12 +68,12 @@ gtk-x11-2.0.gir:
              --include=$(GIRDIR)/gobject-2.0.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/pango-1.0.gir \
-             --include=$(srcdir)/atk-1.0.gir \
+             --include=$(srcdir)/atk.gir \
              --include=$(srcdir)/gdk-x11-2.0.gir \
 	     --library=$(GTK_LIBDIR)/libgtk-x11-2.0.so.0 \
              --pkg gobject-2.0 \
              --pkg cairo \
-             --pkg atk-1.0 \
+             --pkg atk \
              --pkg pango-1.0 \
              --pkg gdk-2.0 \
              --pkg gtk+-2.0 \
diff --git a/gir-repository/gir/atk-1.0.gir b/gir-repository/gir/atk-1.0.gir
deleted file mode 100644
index 4a12c39..0000000
--- a/gir-repository/gir/atk-1.0.gir
+++ /dev/null
@@ -1,6316 +0,0 @@
-<repository version="1.0"
-            xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <namespace name="Atk">
-    <enumeration name="StateType"
-                 c:type="AtkStateType"
-                 glib:type-name="AtkStateType"
-                 glib:get-type="atk_state_type_get_type">
-      <member name="invalid"
-                value="0"
-                c:identifier="ATK_STATE_INVALID"
-                glib:nick="invalid"/>
-      <member name="active"
-                value="1"
-                c:identifier="ATK_STATE_ACTIVE"
-                glib:nick="active"/>
-      <member name="armed"
-                value="2"
-                c:identifier="ATK_STATE_ARMED"
-                glib:nick="armed"/>
-      <member name="busy"
-                value="3"
-                c:identifier="ATK_STATE_BUSY"
-                glib:nick="busy"/>
-      <member name="checked"
-                value="4"
-                c:identifier="ATK_STATE_CHECKED"
-                glib:nick="checked"/>
-      <member name="defunct"
-                value="5"
-                c:identifier="ATK_STATE_DEFUNCT"
-                glib:nick="defunct"/>
-      <member name="editable"
-                value="6"
-                c:identifier="ATK_STATE_EDITABLE"
-                glib:nick="editable"/>
-      <member name="enabled"
-                value="7"
-                c:identifier="ATK_STATE_ENABLED"
-                glib:nick="enabled"/>
-      <member name="expandable"
-                value="8"
-                c:identifier="ATK_STATE_EXPANDABLE"
-                glib:nick="expandable"/>
-      <member name="expanded"
-                value="9"
-                c:identifier="ATK_STATE_EXPANDED"
-                glib:nick="expanded"/>
-      <member name="focusable"
-                value="10"
-                c:identifier="ATK_STATE_FOCUSABLE"
-                glib:nick="focusable"/>
-      <member name="focused"
-                value="11"
-                c:identifier="ATK_STATE_FOCUSED"
-                glib:nick="focused"/>
-      <member name="horizontal"
-                value="12"
-                c:identifier="ATK_STATE_HORIZONTAL"
-                glib:nick="horizontal"/>
-      <member name="iconified"
-                value="13"
-                c:identifier="ATK_STATE_ICONIFIED"
-                glib:nick="iconified"/>
-      <member name="modal"
-                value="14"
-                c:identifier="ATK_STATE_MODAL"
-                glib:nick="modal"/>
-      <member name="multi-line"
-                value="15"
-                c:identifier="ATK_STATE_MULTI_LINE"
-                glib:nick="multi-line"/>
-      <member name="multiselectable"
-                value="16"
-                c:identifier="ATK_STATE_MULTISELECTABLE"
-                glib:nick="multiselectable"/>
-      <member name="opaque"
-                value="17"
-                c:identifier="ATK_STATE_OPAQUE"
-                glib:nick="opaque"/>
-      <member name="pressed"
-                value="18"
-                c:identifier="ATK_STATE_PRESSED"
-                glib:nick="pressed"/>
-      <member name="resizable"
-                value="19"
-                c:identifier="ATK_STATE_RESIZABLE"
-                glib:nick="resizable"/>
-      <member name="selectable"
-                value="20"
-                c:identifier="ATK_STATE_SELECTABLE"
-                glib:nick="selectable"/>
-      <member name="selected"
-                value="21"
-                c:identifier="ATK_STATE_SELECTED"
-                glib:nick="selected"/>
-      <member name="sensitive"
-                value="22"
-                c:identifier="ATK_STATE_SENSITIVE"
-                glib:nick="sensitive"/>
-      <member name="showing"
-                value="23"
-                c:identifier="ATK_STATE_SHOWING"
-                glib:nick="showing"/>
-      <member name="single-line"
-                value="24"
-                c:identifier="ATK_STATE_SINGLE_LINE"
-                glib:nick="single-line"/>
-      <member name="stale"
-                value="25"
-                c:identifier="ATK_STATE_STALE"
-                glib:nick="stale"/>
-      <member name="transient"
-                value="26"
-                c:identifier="ATK_STATE_TRANSIENT"
-                glib:nick="transient"/>
-      <member name="vertical"
-                value="27"
-                c:identifier="ATK_STATE_VERTICAL"
-                glib:nick="vertical"/>
-      <member name="visible"
-                value="28"
-                c:identifier="ATK_STATE_VISIBLE"
-                glib:nick="visible"/>
-      <member name="manages-descendants"
-                value="29"
-                c:identifier="ATK_STATE_MANAGES_DESCENDANTS"
-                glib:nick="manages-descendants"/>
-      <member name="indeterminate"
-                value="30"
-                c:identifier="ATK_STATE_INDETERMINATE"
-                glib:nick="indeterminate"/>
-      <member name="truncated"
-                value="31"
-                c:identifier="ATK_STATE_TRUNCATED"
-                glib:nick="truncated"/>
-      <member name="required"
-                value="32"
-                c:identifier="ATK_STATE_REQUIRED"
-                glib:nick="required"/>
-      <member name="invalid-entry"
-                value="33"
-                c:identifier="ATK_STATE_INVALID_ENTRY"
-                glib:nick="invalid-entry"/>
-      <member name="supports-autocompletion"
-                value="34"
-                c:identifier="ATK_STATE_SUPPORTS_AUTOCOMPLETION"
-                glib:nick="supports-autocompletion"/>
-      <member name="selectable-text"
-                value="35"
-                c:identifier="ATK_STATE_SELECTABLE_TEXT"
-                glib:nick="selectable-text"/>
-      <member name="default"
-                value="36"
-                c:identifier="ATK_STATE_DEFAULT"
-                glib:nick="default"/>
-      <member name="animated"
-                value="37"
-                c:identifier="ATK_STATE_ANIMATED"
-                glib:nick="animated"/>
-      <member name="visited"
-                value="38"
-                c:identifier="ATK_STATE_VISITED"
-                glib:nick="visited"/>
-      <member name="last-defined"
-                value="39"
-                c:identifier="ATK_STATE_LAST_DEFINED"
-                glib:nick="last-defined"/>
-    </enumeration>
-    <function name="state_type_register" c:identifier="atk_state_type_register">
-      <return-value>
-        <type name="AtkStateType" c:type="AtkStateType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="state_type_get_name" c:identifier="atk_state_type_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="AtkStateType" c:type="AtkStateType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="state_type_for_name" c:identifier="atk_state_type_for_name">
-      <return-value>
-        <type name="AtkStateType" c:type="AtkStateType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <enumeration name="RelationType"
-                 c:type="AtkRelationType"
-                 glib:type-name="AtkRelationType"
-                 glib:get-type="atk_relation_type_get_type">
-      <member name="null"
-                value="0"
-                c:identifier="ATK_RELATION_NULL"
-                glib:nick="null"/>
-      <member name="controlled-by"
-                value="1"
-                c:identifier="ATK_RELATION_CONTROLLED_BY"
-                glib:nick="controlled-by"/>
-      <member name="controller-for"
-                value="2"
-                c:identifier="ATK_RELATION_CONTROLLER_FOR"
-                glib:nick="controller-for"/>
-      <member name="label-for"
-                value="3"
-                c:identifier="ATK_RELATION_LABEL_FOR"
-                glib:nick="label-for"/>
-      <member name="labelled-by"
-                value="4"
-                c:identifier="ATK_RELATION_LABELLED_BY"
-                glib:nick="labelled-by"/>
-      <member name="member-of"
-                value="5"
-                c:identifier="ATK_RELATION_MEMBER_OF"
-                glib:nick="member-of"/>
-      <member name="node-child-of"
-                value="6"
-                c:identifier="ATK_RELATION_NODE_CHILD_OF"
-                glib:nick="node-child-of"/>
-      <member name="flows-to"
-                value="7"
-                c:identifier="ATK_RELATION_FLOWS_TO"
-                glib:nick="flows-to"/>
-      <member name="flows-from"
-                value="8"
-                c:identifier="ATK_RELATION_FLOWS_FROM"
-                glib:nick="flows-from"/>
-      <member name="subwindow-of"
-                value="9"
-                c:identifier="ATK_RELATION_SUBWINDOW_OF"
-                glib:nick="subwindow-of"/>
-      <member name="embeds"
-                value="10"
-                c:identifier="ATK_RELATION_EMBEDS"
-                glib:nick="embeds"/>
-      <member name="embedded-by"
-                value="11"
-                c:identifier="ATK_RELATION_EMBEDDED_BY"
-                glib:nick="embedded-by"/>
-      <member name="popup-for"
-                value="12"
-                c:identifier="ATK_RELATION_POPUP_FOR"
-                glib:nick="popup-for"/>
-      <member name="parent-window-of"
-                value="13"
-                c:identifier="ATK_RELATION_PARENT_WINDOW_OF"
-                glib:nick="parent-window-of"/>
-      <member name="described-by"
-                value="14"
-                c:identifier="ATK_RELATION_DESCRIBED_BY"
-                glib:nick="described-by"/>
-      <member name="description-for"
-                value="15"
-                c:identifier="ATK_RELATION_DESCRIPTION_FOR"
-                glib:nick="description-for"/>
-      <member name="last-defined"
-                value="16"
-                c:identifier="ATK_RELATION_LAST_DEFINED"
-                glib:nick="last-defined"/>
-    </enumeration>
-    <enumeration name="Role"
-                 c:type="AtkRole"
-                 glib:type-name="AtkRole"
-                 glib:get-type="atk_role_get_type">
-      <member name="invalid"
-                value="0"
-                c:identifier="ATK_ROLE_INVALID"
-                glib:nick="invalid"/>
-      <member name="accel-label"
-                value="1"
-                c:identifier="ATK_ROLE_ACCEL_LABEL"
-                glib:nick="accel-label"/>
-      <member name="alert"
-                value="2"
-                c:identifier="ATK_ROLE_ALERT"
-                glib:nick="alert"/>
-      <member name="animation"
-                value="3"
-                c:identifier="ATK_ROLE_ANIMATION"
-                glib:nick="animation"/>
-      <member name="arrow"
-                value="4"
-                c:identifier="ATK_ROLE_ARROW"
-                glib:nick="arrow"/>
-      <member name="calendar"
-                value="5"
-                c:identifier="ATK_ROLE_CALENDAR"
-                glib:nick="calendar"/>
-      <member name="canvas"
-                value="6"
-                c:identifier="ATK_ROLE_CANVAS"
-                glib:nick="canvas"/>
-      <member name="check-box"
-                value="7"
-                c:identifier="ATK_ROLE_CHECK_BOX"
-                glib:nick="check-box"/>
-      <member name="check-menu-item"
-                value="8"
-                c:identifier="ATK_ROLE_CHECK_MENU_ITEM"
-                glib:nick="check-menu-item"/>
-      <member name="color-chooser"
-                value="9"
-                c:identifier="ATK_ROLE_COLOR_CHOOSER"
-                glib:nick="color-chooser"/>
-      <member name="column-header"
-                value="10"
-                c:identifier="ATK_ROLE_COLUMN_HEADER"
-                glib:nick="column-header"/>
-      <member name="combo-box"
-                value="11"
-                c:identifier="ATK_ROLE_COMBO_BOX"
-                glib:nick="combo-box"/>
-      <member name="date-editor"
-                value="12"
-                c:identifier="ATK_ROLE_DATE_EDITOR"
-                glib:nick="date-editor"/>
-      <member name="desktop-icon"
-                value="13"
-                c:identifier="ATK_ROLE_DESKTOP_ICON"
-                glib:nick="desktop-icon"/>
-      <member name="desktop-frame"
-                value="14"
-                c:identifier="ATK_ROLE_DESKTOP_FRAME"
-                glib:nick="desktop-frame"/>
-      <member name="dial"
-                value="15"
-                c:identifier="ATK_ROLE_DIAL"
-                glib:nick="dial"/>
-      <member name="dialog"
-                value="16"
-                c:identifier="ATK_ROLE_DIALOG"
-                glib:nick="dialog"/>
-      <member name="directory-pane"
-                value="17"
-                c:identifier="ATK_ROLE_DIRECTORY_PANE"
-                glib:nick="directory-pane"/>
-      <member name="drawing-area"
-                value="18"
-                c:identifier="ATK_ROLE_DRAWING_AREA"
-                glib:nick="drawing-area"/>
-      <member name="file-chooser"
-                value="19"
-                c:identifier="ATK_ROLE_FILE_CHOOSER"
-                glib:nick="file-chooser"/>
-      <member name="filler"
-                value="20"
-                c:identifier="ATK_ROLE_FILLER"
-                glib:nick="filler"/>
-      <member name="font-chooser"
-                value="21"
-                c:identifier="ATK_ROLE_FONT_CHOOSER"
-                glib:nick="font-chooser"/>
-      <member name="frame"
-                value="22"
-                c:identifier="ATK_ROLE_FRAME"
-                glib:nick="frame"/>
-      <member name="glass-pane"
-                value="23"
-                c:identifier="ATK_ROLE_GLASS_PANE"
-                glib:nick="glass-pane"/>
-      <member name="html-container"
-                value="24"
-                c:identifier="ATK_ROLE_HTML_CONTAINER"
-                glib:nick="html-container"/>
-      <member name="icon"
-                value="25"
-                c:identifier="ATK_ROLE_ICON"
-                glib:nick="icon"/>
-      <member name="image"
-                value="26"
-                c:identifier="ATK_ROLE_IMAGE"
-                glib:nick="image"/>
-      <member name="internal-frame"
-                value="27"
-                c:identifier="ATK_ROLE_INTERNAL_FRAME"
-                glib:nick="internal-frame"/>
-      <member name="label"
-                value="28"
-                c:identifier="ATK_ROLE_LABEL"
-                glib:nick="label"/>
-      <member name="layered-pane"
-                value="29"
-                c:identifier="ATK_ROLE_LAYERED_PANE"
-                glib:nick="layered-pane"/>
-      <member name="list"
-                value="30"
-                c:identifier="ATK_ROLE_LIST"
-                glib:nick="list"/>
-      <member name="list-item"
-                value="31"
-                c:identifier="ATK_ROLE_LIST_ITEM"
-                glib:nick="list-item"/>
-      <member name="menu"
-                value="32"
-                c:identifier="ATK_ROLE_MENU"
-                glib:nick="menu"/>
-      <member name="menu-bar"
-                value="33"
-                c:identifier="ATK_ROLE_MENU_BAR"
-                glib:nick="menu-bar"/>
-      <member name="menu-item"
-                value="34"
-                c:identifier="ATK_ROLE_MENU_ITEM"
-                glib:nick="menu-item"/>
-      <member name="option-pane"
-                value="35"
-                c:identifier="ATK_ROLE_OPTION_PANE"
-                glib:nick="option-pane"/>
-      <member name="page-tab"
-                value="36"
-                c:identifier="ATK_ROLE_PAGE_TAB"
-                glib:nick="page-tab"/>
-      <member name="page-tab-list"
-                value="37"
-                c:identifier="ATK_ROLE_PAGE_TAB_LIST"
-                glib:nick="page-tab-list"/>
-      <member name="panel"
-                value="38"
-                c:identifier="ATK_ROLE_PANEL"
-                glib:nick="panel"/>
-      <member name="password-text"
-                value="39"
-                c:identifier="ATK_ROLE_PASSWORD_TEXT"
-                glib:nick="password-text"/>
-      <member name="popup-menu"
-                value="40"
-                c:identifier="ATK_ROLE_POPUP_MENU"
-                glib:nick="popup-menu"/>
-      <member name="progress-bar"
-                value="41"
-                c:identifier="ATK_ROLE_PROGRESS_BAR"
-                glib:nick="progress-bar"/>
-      <member name="push-button"
-                value="42"
-                c:identifier="ATK_ROLE_PUSH_BUTTON"
-                glib:nick="push-button"/>
-      <member name="radio-button"
-                value="43"
-                c:identifier="ATK_ROLE_RADIO_BUTTON"
-                glib:nick="radio-button"/>
-      <member name="radio-menu-item"
-                value="44"
-                c:identifier="ATK_ROLE_RADIO_MENU_ITEM"
-                glib:nick="radio-menu-item"/>
-      <member name="root-pane"
-                value="45"
-                c:identifier="ATK_ROLE_ROOT_PANE"
-                glib:nick="root-pane"/>
-      <member name="row-header"
-                value="46"
-                c:identifier="ATK_ROLE_ROW_HEADER"
-                glib:nick="row-header"/>
-      <member name="scroll-bar"
-                value="47"
-                c:identifier="ATK_ROLE_SCROLL_BAR"
-                glib:nick="scroll-bar"/>
-      <member name="scroll-pane"
-                value="48"
-                c:identifier="ATK_ROLE_SCROLL_PANE"
-                glib:nick="scroll-pane"/>
-      <member name="separator"
-                value="49"
-                c:identifier="ATK_ROLE_SEPARATOR"
-                glib:nick="separator"/>
-      <member name="slider"
-                value="50"
-                c:identifier="ATK_ROLE_SLIDER"
-                glib:nick="slider"/>
-      <member name="split-pane"
-                value="51"
-                c:identifier="ATK_ROLE_SPLIT_PANE"
-                glib:nick="split-pane"/>
-      <member name="spin-button"
-                value="52"
-                c:identifier="ATK_ROLE_SPIN_BUTTON"
-                glib:nick="spin-button"/>
-      <member name="statusbar"
-                value="53"
-                c:identifier="ATK_ROLE_STATUSBAR"
-                glib:nick="statusbar"/>
-      <member name="table"
-                value="54"
-                c:identifier="ATK_ROLE_TABLE"
-                glib:nick="table"/>
-      <member name="table-cell"
-                value="55"
-                c:identifier="ATK_ROLE_TABLE_CELL"
-                glib:nick="table-cell"/>
-      <member name="table-column-header"
-                value="56"
-                c:identifier="ATK_ROLE_TABLE_COLUMN_HEADER"
-                glib:nick="table-column-header"/>
-      <member name="table-row-header"
-                value="57"
-                c:identifier="ATK_ROLE_TABLE_ROW_HEADER"
-                glib:nick="table-row-header"/>
-      <member name="tear-off-menu-item"
-                value="58"
-                c:identifier="ATK_ROLE_TEAR_OFF_MENU_ITEM"
-                glib:nick="tear-off-menu-item"/>
-      <member name="terminal"
-                value="59"
-                c:identifier="ATK_ROLE_TERMINAL"
-                glib:nick="terminal"/>
-      <member name="text"
-                value="60"
-                c:identifier="ATK_ROLE_TEXT"
-                glib:nick="text"/>
-      <member name="toggle-button"
-                value="61"
-                c:identifier="ATK_ROLE_TOGGLE_BUTTON"
-                glib:nick="toggle-button"/>
-      <member name="tool-bar"
-                value="62"
-                c:identifier="ATK_ROLE_TOOL_BAR"
-                glib:nick="tool-bar"/>
-      <member name="tool-tip"
-                value="63"
-                c:identifier="ATK_ROLE_TOOL_TIP"
-                glib:nick="tool-tip"/>
-      <member name="tree"
-                value="64"
-                c:identifier="ATK_ROLE_TREE"
-                glib:nick="tree"/>
-      <member name="tree-table"
-                value="65"
-                c:identifier="ATK_ROLE_TREE_TABLE"
-                glib:nick="tree-table"/>
-      <member name="unknown"
-                value="66"
-                c:identifier="ATK_ROLE_UNKNOWN"
-                glib:nick="unknown"/>
-      <member name="viewport"
-                value="67"
-                c:identifier="ATK_ROLE_VIEWPORT"
-                glib:nick="viewport"/>
-      <member name="window"
-                value="68"
-                c:identifier="ATK_ROLE_WINDOW"
-                glib:nick="window"/>
-      <member name="header"
-                value="69"
-                c:identifier="ATK_ROLE_HEADER"
-                glib:nick="header"/>
-      <member name="footer"
-                value="70"
-                c:identifier="ATK_ROLE_FOOTER"
-                glib:nick="footer"/>
-      <member name="paragraph"
-                value="71"
-                c:identifier="ATK_ROLE_PARAGRAPH"
-                glib:nick="paragraph"/>
-      <member name="ruler"
-                value="72"
-                c:identifier="ATK_ROLE_RULER"
-                glib:nick="ruler"/>
-      <member name="application"
-                value="73"
-                c:identifier="ATK_ROLE_APPLICATION"
-                glib:nick="application"/>
-      <member name="autocomplete"
-                value="74"
-                c:identifier="ATK_ROLE_AUTOCOMPLETE"
-                glib:nick="autocomplete"/>
-      <member name="editbar"
-                value="75"
-                c:identifier="ATK_ROLE_EDITBAR"
-                glib:nick="editbar"/>
-      <member name="embedded"
-                value="76"
-                c:identifier="ATK_ROLE_EMBEDDED"
-                glib:nick="embedded"/>
-      <member name="entry"
-                value="77"
-                c:identifier="ATK_ROLE_ENTRY"
-                glib:nick="entry"/>
-      <member name="chart"
-                value="78"
-                c:identifier="ATK_ROLE_CHART"
-                glib:nick="chart"/>
-      <member name="caption"
-                value="79"
-                c:identifier="ATK_ROLE_CAPTION"
-                glib:nick="caption"/>
-      <member name="document-frame"
-                value="80"
-                c:identifier="ATK_ROLE_DOCUMENT_FRAME"
-                glib:nick="document-frame"/>
-      <member name="heading"
-                value="81"
-                c:identifier="ATK_ROLE_HEADING"
-                glib:nick="heading"/>
-      <member name="page"
-                value="82"
-                c:identifier="ATK_ROLE_PAGE"
-                glib:nick="page"/>
-      <member name="section"
-                value="83"
-                c:identifier="ATK_ROLE_SECTION"
-                glib:nick="section"/>
-      <member name="redundant-object"
-                value="84"
-                c:identifier="ATK_ROLE_REDUNDANT_OBJECT"
-                glib:nick="redundant-object"/>
-      <member name="form"
-                value="85"
-                c:identifier="ATK_ROLE_FORM"
-                glib:nick="form"/>
-      <member name="link"
-                value="86"
-                c:identifier="ATK_ROLE_LINK"
-                glib:nick="link"/>
-      <member name="input-method-window"
-                value="87"
-                c:identifier="ATK_ROLE_INPUT_METHOD_WINDOW"
-                glib:nick="input-method-window"/>
-      <member name="last-defined"
-                value="88"
-                c:identifier="ATK_ROLE_LAST_DEFINED"
-                glib:nick="last-defined"/>
-    </enumeration>
-    <function name="role_register" c:identifier="atk_role_register">
-      <return-value>
-        <type name="AtkRole" c:type="AtkRole"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <enumeration name="Layer"
-                 c:type="AtkLayer"
-                 glib:type-name="AtkLayer"
-                 glib:get-type="atk_layer_get_type">
-      <member name="invalid"
-                value="0"
-                c:identifier="ATK_LAYER_INVALID"
-                glib:nick="invalid"/>
-      <member name="background"
-                value="1"
-                c:identifier="ATK_LAYER_BACKGROUND"
-                glib:nick="background"/>
-      <member name="canvas"
-                value="2"
-                c:identifier="ATK_LAYER_CANVAS"
-                glib:nick="canvas"/>
-      <member name="widget"
-                value="3"
-                c:identifier="ATK_LAYER_WIDGET"
-                glib:nick="widget"/>
-      <member name="mdi"
-                value="4"
-                c:identifier="ATK_LAYER_MDI"
-                glib:nick="mdi"/>
-      <member name="popup"
-                value="5"
-                c:identifier="ATK_LAYER_POPUP"
-                glib:nick="popup"/>
-      <member name="overlay"
-                value="6"
-                c:identifier="ATK_LAYER_OVERLAY"
-                glib:nick="overlay"/>
-      <member name="window"
-                value="7"
-                c:identifier="ATK_LAYER_WINDOW"
-                glib:nick="window"/>
-    </enumeration>
-    <record name="AtkAttribute" c:type="AtkAttribute">
-      <field name="name" value="gchar*"/>
-      <field name="value" value="gchar*"/>
-    </record>
-    <record name="AtkImplementor" c:type="AtkImplementor">
-      <callback name="ref_accessible">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="implementor">
-            <type name="AtkImplementor*" c:type="AtkImplementor*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <record name="AtkPropertyValues" c:type="_AtkPropertyValues"/>
-    <callback name="AtkFunction">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="AtkPropertyChangeHandler">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </parameter>
-        <parameter>
-          <type name="AtkPropertyValues*" c:type="AtkPropertyValues*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="Object"
-           c:type="AtkObject"
-           parent="GLib.Object"
-           glib:type-name="AtkObject"
-           glib:get-type="atk_object_get_type">
-      <constructor name="get_parent" c:identifier="atk_object_get_parent">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="ref_accessible_child"
-                   c:identifier="atk_object_ref_accessible_child">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="factory_create_accessible"
-                   c:identifier="atk_object_factory_create_accessible">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
-          </parameter>
-          <parameter name="obj">
-            <type name="GLib.Object" c:type="GObject*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_name" c:identifier="atk_object_get_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_description" c:identifier="atk_object_get_description">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_accessible_children"
-              c:identifier="atk_object_get_n_accessible_children">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ref_relation_set"
-              c:identifier="atk_object_ref_relation_set">
-        <return-value>
-          <type name="AtkRelationSet" c:type="AtkRelationSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_role" c:identifier="atk_object_get_role">
-        <return-value>
-          <type name="AtkRole" c:type="AtkRole"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_layer" c:identifier="atk_object_get_layer">
-        <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_mdi_zorder" c:identifier="atk_object_get_mdi_zorder">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_attributes" c:identifier="atk_object_get_attributes">
-        <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ref_state_set" c:identifier="atk_object_ref_state_set">
-        <return-value>
-          <type name="AtkStateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_index_in_parent"
-              c:identifier="atk_object_get_index_in_parent">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_name" c:identifier="atk_object_set_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_description" c:identifier="atk_object_set_description">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="description">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_parent" c:identifier="atk_object_set_parent">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_role" c:identifier="atk_object_set_role">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="role">
-            <type name="AtkRole" c:type="AtkRole"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="connect_property_change_handler"
-              c:identifier="atk_object_connect_property_change_handler">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="handler">
-            <type name="AtkPropertyChangeHandler"
-                    c:type="AtkPropertyChangeHandler*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_property_change_handler"
-              c:identifier="atk_object_remove_property_change_handler">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="notify_state_change"
-              c:identifier="atk_object_notify_state_change">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="state">
-            <type name="AtkState" c:type="AtkState"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="initialize" c:identifier="atk_object_initialize">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_relationship"
-              c:identifier="atk_object_add_relationship">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="AtkRelationType" c:type="AtkRelationType"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_relationship"
-              c:identifier="atk_object_remove_relationship">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="AtkRelationType" c:type="AtkRelationType"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="accessible-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="accessible-description">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="accessible-parent">
-        <type name="AtkObject" c:type="AtkObject"/>
-      </property>
-      <property name="accessible-value">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="accessible-role">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="accessible-component-layer">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="accessible-component-mdi-zorder">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="accessible-table-caption">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="accessible-table-column-description">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="accessible-table-column-header">
-        <type name="AtkObject" c:type="AtkObject"/>
-      </property>
-      <property name="accessible-table-row-description">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="accessible-table-row-header">
-        <type name="AtkObject" c:type="AtkObject"/>
-      </property>
-      <property name="accessible-table-summary">
-        <type name="AtkObject" c:type="AtkObject"/>
-      </property>
-      <property name="accessible-table-caption-object">
-        <type name="AtkObject" c:type="AtkObject"/>
-      </property>
-      <property name="accessible-hypertext-nlinks">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="get_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_description">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_parent">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_children">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_child">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_index_in_parent">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_relation_set">
-        <return-value>
-          <type name="AtkRelationSet*" c:type="AtkRelationSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_role">
-        <return-value>
-          <type name="AtkRole" c:type="AtkRole"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_layer">
-        <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_mdi_zorder">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_state_set">
-        <return-value>
-          <type name="AtkStateSet*" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_description">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="description">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_parent">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_role">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="role">
-            <type name="AtkRole" c:type="AtkRole"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="connect_property_change_handler">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="handler">
-            <type name="AtkPropertyChangeHandler*"
-                    c:type="AtkPropertyChangeHandler*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_property_change_handler">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="initialize">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="children_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="change_index">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="changed_child">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="focus_event">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="focus_in">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="property_change">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="AtkPropertyValues*" c:type="AtkPropertyValues*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="state_change">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="state_set">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="visible_data_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="active_descendant_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="gpointer*" c:type="gpointer*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_attributes">
-        <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <glib:signal name="children-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="focus-event">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="property-change">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="state-change">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="visible-data-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="active-descendant-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <interface name="ImplementorIface"
-               c:type="AtkImplementorIface"
-               glib:type-name="AtkImplementorIface"
-               glib:get-type="atk_implementor_get_type">
-    </interface>
-    <function name="implementor_ref_accessible"
-              c:identifier="atk_implementor_ref_accessible">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="implementor">
-          <type name="AtkImplementor" c:type="AtkImplementor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_get_name" c:identifier="atk_role_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="role">
-          <type name="AtkRole" c:type="AtkRole"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_for_name" c:identifier="atk_role_for_name">
-      <return-value>
-        <type name="AtkRole" c:type="AtkRole"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_get_localized_name"
-              c:identifier="atk_role_get_localized_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="role">
-          <type name="AtkRole" c:type="AtkRole"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkAction" c:type="AtkAction"/>
-    <interface name="Action"
-               c:type="AtkAction"
-               glib:type-name="AtkAction"
-               glib:get-type="atk_action_get_type">
-      <callback name="do_action">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_actions">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_description">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_keybinding">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_description">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="desc">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_localized_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad2" value="AtkFunction"/>
-    </interface>
-    <function name="action_do_action" c:identifier="atk_action_do_action">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_n_actions"
-              c:identifier="atk_action_get_n_actions">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_description"
-              c:identifier="atk_action_get_description">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_name" c:identifier="atk_action_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_keybinding"
-              c:identifier="atk_action_get_keybinding">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_set_description"
-              c:identifier="atk_action_set_description">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="desc">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_localized_name"
-              c:identifier="atk_action_get_localized_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkKeyEventStruct" c:type="AtkKeyEventStruct">
-      <field name="type" value="gint"/>
-      <field name="state" value="guint"/>
-      <field name="keyval" value="guint"/>
-      <field name="length" value="gint"/>
-      <field name="string" value="gchar*"/>
-      <field name="keycode" value="guint16"/>
-      <field name="timestamp" value="guint32"/>
-    </record>
-    <callback name="AtkEventListener">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="AtkEventListenerInit">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </callback>
-    <callback name="AtkKeySnoopFunc">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="AtkKeyEventStruct*" c:type="AtkKeyEventStruct*"/>
-        </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="KeyEventType"
-                 c:type="AtkKeyEventType"
-                 glib:type-name="AtkKeyEventType"
-                 glib:get-type="atk_key_event_type_get_type">
-      <member name="press"
-                value="0"
-                c:identifier="ATK_KEY_EVENT_PRESS"
-                glib:nick="press"/>
-      <member name="release"
-                value="1"
-                c:identifier="ATK_KEY_EVENT_RELEASE"
-                glib:nick="release"/>
-      <member name="last-defined"
-                value="2"
-                c:identifier="ATK_KEY_EVENT_LAST_DEFINED"
-                glib:nick="last-defined"/>
-    </enumeration>
-    <class name="Util"
-           c:type="AtkUtil"
-           parent="GLib.Object"
-           glib:type-name="AtkUtil"
-           glib:get-type="atk_util_get_type">
-      <callback name="add_global_event_listener">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener">
-            <type name="GSignalEmissionHook" c:type="GSignalEmissionHook"/>
-          </parameter>
-          <parameter name="event_type">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_global_event_listener">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_key_event_listener">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener">
-            <type name="AtkKeySnoopFunc" c:type="AtkKeySnoopFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_key_event_listener">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_root">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-      </callback>
-      <callback name="get_toolkit_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-      </callback>
-      <callback name="get_toolkit_version">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-      </callback>
-    </class>
-    <enumeration name="CoordType"
-                 c:type="AtkCoordType"
-                 glib:type-name="AtkCoordType"
-                 glib:get-type="atk_coord_type_get_type">
-      <member name="screen"
-                value="0"
-                c:identifier="ATK_XY_SCREEN"
-                glib:nick="screen"/>
-      <member name="window"
-                value="1"
-                c:identifier="ATK_XY_WINDOW"
-                glib:nick="window"/>
-    </enumeration>
-    <function name="add_focus_tracker" c:identifier="atk_add_focus_tracker">
-      <return-value>
-        <type name="guint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="focus_tracker">
-          <type name="AtkEventListener" c:type="AtkEventListener"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="remove_focus_tracker"
-              c:identifier="atk_remove_focus_tracker">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tracker_id">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="focus_tracker_init" c:identifier="atk_focus_tracker_init">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="init">
-          <type name="AtkEventListenerInit" c:type="AtkEventListenerInit"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="focus_tracker_notify"
-              c:identifier="atk_focus_tracker_notify">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="add_global_event_listener"
-              c:identifier="atk_add_global_event_listener">
-      <return-value>
-        <type name="guint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="listener">
-          <type name="GSignalEmissionHook" c:type="GSignalEmissionHook"/>
-        </parameter>
-        <parameter name="event_type">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="remove_global_event_listener"
-              c:identifier="atk_remove_global_event_listener">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="listener_id">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="add_key_event_listener"
-              c:identifier="atk_add_key_event_listener">
-      <return-value>
-        <type name="guint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="listener">
-          <type name="AtkKeySnoopFunc" c:type="AtkKeySnoopFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="remove_key_event_listener"
-              c:identifier="atk_remove_key_event_listener">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="listener_id">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_root" c:identifier="atk_get_root">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-    </function>
-    <function name="get_focus_object" c:identifier="atk_get_focus_object">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-    </function>
-    <function name="get_toolkit_name" c:identifier="atk_get_toolkit_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_toolkit_version" c:identifier="atk_get_toolkit_version">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_version" c:identifier="atk_get_version">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <record name="AtkComponent" c:type="AtkComponent"/>
-    <callback name="AtkFocusHandler">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </parameter>
-        <parameter>
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <glib:boxed c:type="Rectangle"
-                glib:name="Rectangle"
-                glib:type-name="AtkRectangle"
-                glib:get-type="atk_rectangle_get_type">
-    </glib:boxed>
-    <interface name="Component"
-               c:type="AtkComponent"
-               glib:type-name="AtkComponent"
-               glib:get-type="atk_component_get_type">
-      <callback name="add_focus_handler">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="handler">
-            <type name="AtkFocusHandler" c:type="AtkFocusHandler"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="contains">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_accessible_at_point">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_extents">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="grab_focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_focus_handler">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_extents">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_size">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_layer">
-        <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_mdi_zorder">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="bounds_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="bounds">
-            <type name="AtkRectangle*" c:type="AtkRectangle*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_alpha">
-        <return-value>
-          <type name="gdouble" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="bounds-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="AtkRectangle" c:type="AtkRectangle"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </interface>
-    <function name="component_add_focus_handler"
-              c:identifier="atk_component_add_focus_handler">
-      <return-value>
-        <type name="guint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="handler">
-          <type name="AtkFocusHandler" c:type="AtkFocusHandler"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_contains" c:identifier="atk_component_contains">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_ref_accessible_at_point"
-              c:identifier="atk_component_ref_accessible_at_point">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_extents"
-              c:identifier="atk_component_get_extents">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_position"
-              c:identifier="atk_component_get_position">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_size" c:identifier="atk_component_get_size">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_layer" c:identifier="atk_component_get_layer">
-      <return-value>
-        <type name="AtkLayer" c:type="AtkLayer"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_mdi_zorder"
-              c:identifier="atk_component_get_mdi_zorder">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_grab_focus"
-              c:identifier="atk_component_grab_focus">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_remove_focus_handler"
-              c:identifier="atk_component_remove_focus_handler">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="handler_id">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_extents"
-              c:identifier="atk_component_set_extents">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_position"
-              c:identifier="atk_component_set_position">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_size" c:identifier="atk_component_set_size">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_alpha" c:identifier="atk_component_get_alpha">
-      <return-value>
-        <type name="gdouble" c:type="gdouble"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkDocument" c:type="AtkDocument"/>
-    <interface name="Document"
-               c:type="AtkDocument"
-               glib:type-name="AtkDocument"
-               glib:get-type="atk_document_get_type">
-      <callback name="get_document_type">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_document">
-        <return-value>
-          <type name="gpointer" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_document_locale">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_document_attributes">
-        <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_document_attribute_value">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-          <parameter name="attribute_name">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_document_attribute">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
-          </parameter>
-          <parameter name="attribute_name">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="attribute_value">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <field name="pad3" value="AtkFunction"/>
-      <field name="pad4" value="AtkFunction"/>
-      <glib:signal name="load-complete">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="reload">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="load-stopped">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="document_get_document_type"
-              c:identifier="atk_document_get_document_type">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="document_get_document"
-              c:identifier="atk_document_get_document">
-      <return-value>
-        <type name="gpointer" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="document_get_locale" c:identifier="atk_document_get_locale">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="document_get_attributes"
-              c:identifier="atk_document_get_attributes">
-      <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="document_get_attribute_value"
-              c:identifier="atk_document_get_attribute_value">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-        <parameter name="attribute_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="document_set_attribute_value"
-              c:identifier="atk_document_set_attribute_value">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
-        </parameter>
-        <parameter name="attribute_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="attribute_value">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <enumeration name="TextAttribute"
-                 c:type="AtkTextAttribute"
-                 glib:type-name="AtkTextAttribute"
-                 glib:get-type="atk_text_attribute_get_type">
-      <member name="invalid"
-                value="0"
-                c:identifier="ATK_TEXT_ATTR_INVALID"
-                glib:nick="invalid"/>
-      <member name="left-margin"
-                value="1"
-                c:identifier="ATK_TEXT_ATTR_LEFT_MARGIN"
-                glib:nick="left-margin"/>
-      <member name="right-margin"
-                value="2"
-                c:identifier="ATK_TEXT_ATTR_RIGHT_MARGIN"
-                glib:nick="right-margin"/>
-      <member name="indent"
-                value="3"
-                c:identifier="ATK_TEXT_ATTR_INDENT"
-                glib:nick="indent"/>
-      <member name="invisible"
-                value="4"
-                c:identifier="ATK_TEXT_ATTR_INVISIBLE"
-                glib:nick="invisible"/>
-      <member name="editable"
-                value="5"
-                c:identifier="ATK_TEXT_ATTR_EDITABLE"
-                glib:nick="editable"/>
-      <member name="pixels-above-lines"
-                value="6"
-                c:identifier="ATK_TEXT_ATTR_PIXELS_ABOVE_LINES"
-                glib:nick="pixels-above-lines"/>
-      <member name="pixels-below-lines"
-                value="7"
-                c:identifier="ATK_TEXT_ATTR_PIXELS_BELOW_LINES"
-                glib:nick="pixels-below-lines"/>
-      <member name="pixels-inside-wrap"
-                value="8"
-                c:identifier="ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP"
-                glib:nick="pixels-inside-wrap"/>
-      <member name="bg-full-height"
-                value="9"
-                c:identifier="ATK_TEXT_ATTR_BG_FULL_HEIGHT"
-                glib:nick="bg-full-height"/>
-      <member name="rise"
-                value="10"
-                c:identifier="ATK_TEXT_ATTR_RISE"
-                glib:nick="rise"/>
-      <member name="underline"
-                value="11"
-                c:identifier="ATK_TEXT_ATTR_UNDERLINE"
-                glib:nick="underline"/>
-      <member name="strikethrough"
-                value="12"
-                c:identifier="ATK_TEXT_ATTR_STRIKETHROUGH"
-                glib:nick="strikethrough"/>
-      <member name="size"
-                value="13"
-                c:identifier="ATK_TEXT_ATTR_SIZE"
-                glib:nick="size"/>
-      <member name="scale"
-                value="14"
-                c:identifier="ATK_TEXT_ATTR_SCALE"
-                glib:nick="scale"/>
-      <member name="weight"
-                value="15"
-                c:identifier="ATK_TEXT_ATTR_WEIGHT"
-                glib:nick="weight"/>
-      <member name="language"
-                value="16"
-                c:identifier="ATK_TEXT_ATTR_LANGUAGE"
-                glib:nick="language"/>
-      <member name="family-name"
-                value="17"
-                c:identifier="ATK_TEXT_ATTR_FAMILY_NAME"
-                glib:nick="family-name"/>
-      <member name="bg-color"
-                value="18"
-                c:identifier="ATK_TEXT_ATTR_BG_COLOR"
-                glib:nick="bg-color"/>
-      <member name="fg-color"
-                value="19"
-                c:identifier="ATK_TEXT_ATTR_FG_COLOR"
-                glib:nick="fg-color"/>
-      <member name="bg-stipple"
-                value="20"
-                c:identifier="ATK_TEXT_ATTR_BG_STIPPLE"
-                glib:nick="bg-stipple"/>
-      <member name="fg-stipple"
-                value="21"
-                c:identifier="ATK_TEXT_ATTR_FG_STIPPLE"
-                glib:nick="fg-stipple"/>
-      <member name="wrap-mode"
-                value="22"
-                c:identifier="ATK_TEXT_ATTR_WRAP_MODE"
-                glib:nick="wrap-mode"/>
-      <member name="direction"
-                value="23"
-                c:identifier="ATK_TEXT_ATTR_DIRECTION"
-                glib:nick="direction"/>
-      <member name="justification"
-                value="24"
-                c:identifier="ATK_TEXT_ATTR_JUSTIFICATION"
-                glib:nick="justification"/>
-      <member name="stretch"
-                value="25"
-                c:identifier="ATK_TEXT_ATTR_STRETCH"
-                glib:nick="stretch"/>
-      <member name="variant"
-                value="26"
-                c:identifier="ATK_TEXT_ATTR_VARIANT"
-                glib:nick="variant"/>
-      <member name="style"
-                value="27"
-                c:identifier="ATK_TEXT_ATTR_STYLE"
-                glib:nick="style"/>
-      <member name="last-defined"
-                value="28"
-                c:identifier="ATK_TEXT_ATTR_LAST_DEFINED"
-                glib:nick="last-defined"/>
-    </enumeration>
-    <function name="text_attribute_register"
-              c:identifier="atk_text_attribute_register">
-      <return-value>
-        <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkText" c:type="AtkText"/>
-    <enumeration name="TextBoundary"
-                 c:type="AtkTextBoundary"
-                 glib:type-name="AtkTextBoundary"
-                 glib:get-type="atk_text_boundary_get_type">
-      <member name="char"
-                value="0"
-                c:identifier="ATK_TEXT_BOUNDARY_CHAR"
-                glib:nick="char"/>
-      <member name="word-start"
-                value="1"
-                c:identifier="ATK_TEXT_BOUNDARY_WORD_START"
-                glib:nick="word-start"/>
-      <member name="word-end"
-                value="2"
-                c:identifier="ATK_TEXT_BOUNDARY_WORD_END"
-                glib:nick="word-end"/>
-      <member name="sentence-start"
-                value="3"
-                c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_START"
-                glib:nick="sentence-start"/>
-      <member name="sentence-end"
-                value="4"
-                c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_END"
-                glib:nick="sentence-end"/>
-      <member name="line-start"
-                value="5"
-                c:identifier="ATK_TEXT_BOUNDARY_LINE_START"
-                glib:nick="line-start"/>
-      <member name="line-end"
-                value="6"
-                c:identifier="ATK_TEXT_BOUNDARY_LINE_END"
-                glib:nick="line-end"/>
-    </enumeration>
-    <record name="AtkTextRectangle" c:type="AtkTextRectangle">
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="width" value="gint"/>
-      <field name="height" value="gint"/>
-    </record>
-    <record name="AtkTextRange" c:type="AtkTextRange">
-      <field name="bounds" value="AtkTextRectangle"/>
-      <field name="start_offset" value="gint"/>
-      <field name="end_offset" value="gint"/>
-      <field name="content" value="gchar*"/>
-    </record>
-    <enumeration name="TextClipType"
-                 c:type="AtkTextClipType"
-                 glib:type-name="AtkTextClipType"
-                 glib:get-type="atk_text_clip_type_get_type">
-      <member name="none"
-                value="0"
-                c:identifier="ATK_TEXT_CLIP_NONE"
-                glib:nick="none"/>
-      <member name="min"
-                value="1"
-                c:identifier="ATK_TEXT_CLIP_MIN"
-                glib:nick="min"/>
-      <member name="max"
-                value="2"
-                c:identifier="ATK_TEXT_CLIP_MAX"
-                glib:nick="max"/>
-      <member name="both"
-                value="3"
-                c:identifier="ATK_TEXT_CLIP_BOTH"
-                glib:nick="both"/>
-    </enumeration>
-    <interface name="Text"
-               c:type="AtkText"
-               glib:type-name="AtkText"
-               glib:get-type="atk_text_get_type">
-      <callback name="get_text">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_text_after_offset">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_text_at_offset">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_character_at_offset">
-        <return-value>
-          <type name="gunichar" c:type="gunichar"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_text_before_offset">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_caret_offset">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_run_attributes">
-        <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_default_attributes">
-        <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_character_extents">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="coords">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_character_count">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_offset_at_point">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coords">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_selections">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_selection">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="selection_num">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="selection_num">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="selection_num">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_caret_offset">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="text_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="text_caret_moved">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="location">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="text_selection_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="text_attributes_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_range_extents">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="AtkTextRectangle*" c:type="AtkTextRectangle*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_bounded_ranges">
-        <return-value>
-          <type name="AtkTextRange**" c:type="AtkTextRange**"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="AtkTextRectangle*" c:type="AtkTextRectangle*"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-          <parameter name="x_clip_type">
-            <type name="AtkTextClipType" c:type="AtkTextClipType"/>
-          </parameter>
-          <parameter name="y_clip_type">
-            <type name="AtkTextClipType" c:type="AtkTextClipType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad4" value="AtkFunction"/>
-      <glib:signal name="text-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="text-caret-moved">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="text-selection-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="text-attributes-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="text_get_text" c:identifier="atk_text_get_text">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_character_at_offset"
-              c:identifier="atk_text_get_character_at_offset">
-      <return-value>
-        <type name="gunichar" c:type="gunichar"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_text_after_offset"
-              c:identifier="atk_text_get_text_after_offset">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_text_at_offset"
-              c:identifier="atk_text_get_text_at_offset">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_text_before_offset"
-              c:identifier="atk_text_get_text_before_offset">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_caret_offset"
-              c:identifier="atk_text_get_caret_offset">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_character_extents"
-              c:identifier="atk_text_get_character_extents">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="coords">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_run_attributes"
-              c:identifier="atk_text_get_run_attributes">
-      <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_default_attributes"
-              c:identifier="atk_text_get_default_attributes">
-      <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_character_count"
-              c:identifier="atk_text_get_character_count">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_offset_at_point"
-              c:identifier="atk_text_get_offset_at_point">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coords">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_n_selections"
-              c:identifier="atk_text_get_n_selections">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_selection" c:identifier="atk_text_get_selection">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_add_selection" c:identifier="atk_text_add_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_remove_selection"
-              c:identifier="atk_text_remove_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_set_selection" c:identifier="atk_text_set_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_set_caret_offset"
-              c:identifier="atk_text_set_caret_offset">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_range_extents"
-              c:identifier="atk_text_get_range_extents">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-        <parameter name="rect">
-          <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_bounded_ranges"
-              c:identifier="atk_text_get_bounded_ranges">
-      <return-value>
-        <type name="AtkTextRange**" c:type="AtkTextRange**"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="rect">
-          <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
-        </parameter>
-        <parameter name="x_clip_type">
-          <type name="AtkTextClipType" c:type="AtkTextClipType"/>
-        </parameter>
-        <parameter name="y_clip_type">
-          <type name="AtkTextClipType" c:type="AtkTextClipType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_free_ranges" c:identifier="atk_text_free_ranges">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ranges">
-          <type name="AtkTextRange" c:type="AtkTextRange**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="attribute_set_free" c:identifier="atk_attribute_set_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="attrib_set">
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attribute_get_name"
-              c:identifier="atk_text_attribute_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="attr">
-          <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attribute_for_name"
-              c:identifier="atk_text_attribute_for_name">
-      <return-value>
-        <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attribute_get_value"
-              c:identifier="atk_text_attribute_get_value">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="attr">
-          <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
-        </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkEditableText" c:type="AtkEditableText"/>
-    <interface name="EditableText"
-               c:type="AtkEditableText"
-               glib:type-name="AtkEditableText"
-               glib:get-type="atk_editable_text_get_type">
-      <callback name="set_run_attributes">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="attrib_set">
-            <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_text_contents">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="string">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="insert_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="string">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="copy_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cut_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="delete_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="paste_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-    </interface>
-    <function name="editable_text_set_run_attributes"
-              c:identifier="atk_editable_text_set_run_attributes">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="attrib_set">
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_offset">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_set_text_contents"
-              c:identifier="atk_editable_text_set_text_contents">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_insert_text"
-              c:identifier="atk_editable_text_insert_text">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_copy_text"
-              c:identifier="atk_editable_text_copy_text">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_cut_text"
-              c:identifier="atk_editable_text_cut_text">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_delete_text"
-              c:identifier="atk_editable_text_delete_text">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_text_paste_text"
-              c:identifier="atk_editable_text_paste_text">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <bitfield name="HyperlinkStateFlags"
-              c:type="AtkHyperlinkStateFlags"
-              glib:type-name="AtkHyperlinkStateFlags"
-              glib:get-type="atk_hyperlink_state_flags_get_type">
-      <member name="inline"
-                value="1"
-                c:identifier="ATK_HYPERLINK_IS_INLINE"
-                glib:nick="inline"/>
-    </bitfield>
-    <class name="Hyperlink"
-           c:type="AtkHyperlink"
-           parent="GLib.Object"
-           glib:type-name="AtkHyperlink"
-           glib:get-type="atk_hyperlink_get_type">
-      <constructor name="impl_get_hyperlink"
-                   c:identifier="atk_hyperlink_impl_get_hyperlink">
-        <return-value>
-          <type name="Hyperlink" c:type="AtkHyperlink*"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_uri" c:identifier="atk_hyperlink_get_uri">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_object" c:identifier="atk_hyperlink_get_object">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_end_index" c:identifier="atk_hyperlink_get_end_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_start_index"
-              c:identifier="atk_hyperlink_get_start_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_valid" c:identifier="atk_hyperlink_is_valid">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_inline" c:identifier="atk_hyperlink_is_inline">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_anchors" c:identifier="atk_hyperlink_get_n_anchors">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_selected_link"
-              c:identifier="atk_hyperlink_is_selected_link">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="selected-link">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="number-of-anchors">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="end-index">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="start-index">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="get_uri">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_object">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_end_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_start_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_valid">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_anchors">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="link_state">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_selected_link">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="link_activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <glib:signal name="link-activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <record name="AtkHyperlinkImpl" c:type="AtkHyperlinkImpl"/>
-    <interface name="HyperlinkImpl"
-               c:type="AtkHyperlinkImpl"
-               glib:type-name="AtkHyperlinkImpl"
-               glib:get-type="atk_hyperlink_impl_get_type">
-      <callback name="get_hyperlink">
-        <return-value>
-          <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-        </return-value>
-        <parameters>
-          <parameter name="impl">
-            <type name="AtkHyperlinkImpl*" c:type="AtkHyperlinkImpl*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-    </interface>
-    <record name="AtkHypertext" c:type="AtkHypertext"/>
-    <interface name="Hypertext"
-               c:type="AtkHypertext"
-               glib:type-name="AtkHypertext"
-               glib:get-type="atk_hypertext_get_type">
-      <callback name="get_link">
-        <return-value>
-          <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-        </return-value>
-        <parameters>
-          <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
-          </parameter>
-          <parameter name="link_index">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_links">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_link_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
-          </parameter>
-          <parameter name="char_index">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="link_selected">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
-          </parameter>
-          <parameter name="link_index">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <field name="pad3" value="AtkFunction"/>
-      <glib:signal name="link-selected">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </interface>
-    <function name="hypertext_get_link" c:identifier="atk_hypertext_get_link">
-      <return-value>
-        <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
-      </return-value>
-      <parameters>
-        <parameter name="hypertext">
-          <type name="Hypertext" c:type="AtkHypertext*"/>
-        </parameter>
-        <parameter name="link_index">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="hypertext_get_n_links"
-              c:identifier="atk_hypertext_get_n_links">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="hypertext">
-          <type name="Hypertext" c:type="AtkHypertext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="hypertext_get_link_index"
-              c:identifier="atk_hypertext_get_link_index">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="hypertext">
-          <type name="Hypertext" c:type="AtkHypertext*"/>
-        </parameter>
-        <parameter name="char_index">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkImage" c:type="AtkImage"/>
-    <interface name="Image"
-               c:type="AtkImage"
-               glib:type-name="AtkImage"
-               glib:get-type="atk_image_get_type">
-      <callback name="get_image_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_image_description">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_image_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_image_description">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
-          </parameter>
-          <parameter name="description">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_image_locale">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-    </interface>
-    <function name="image_get_image_description"
-              c:identifier="atk_image_get_image_description">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_size"
-              c:identifier="atk_image_get_image_size">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_set_image_description"
-              c:identifier="atk_image_set_image_description">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-        <parameter name="description">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_position"
-              c:identifier="atk_image_get_image_position">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_locale"
-              c:identifier="atk_image_get_image_locale">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="NoOpObject"
-           c:type="AtkNoOpObject"
-           parent="Object"
-           glib:type-name="AtkNoOpObject"
-           glib:get-type="atk_no_op_object_get_type">
-    </class>
-    <function name="no_op_object_new" c:identifier="atk_no_op_object_new">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="GLib.Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ObjectFactory"
-           c:type="AtkObjectFactory"
-           parent="GLib.Object"
-           glib:type-name="AtkObjectFactory"
-           glib:get-type="atk_object_factory_get_type">
-      <method name="invalidate" c:identifier="atk_object_factory_invalidate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_accessible_type"
-              c:identifier="atk_object_factory_get_accessible_type">
-        <return-value>
-          <type name="GType" c:type="GType"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="create_accessible">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="GObject*" c:type="GObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="invalidate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="AtkObjectFactory*" c:type="AtkObjectFactory*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_accessible_type">
-        <return-value>
-          <type name="GType" c:type="GType"/>
-        </return-value>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-    </class>
-    <class name="NoOpObjectFactory"
-           c:type="AtkNoOpObjectFactory"
-           parent="ObjectFactory"
-           glib:type-name="AtkNoOpObjectFactory"
-           glib:get-type="atk_no_op_object_factory_get_type">
-    </class>
-    <function name="no_op_object_factory_new"
-              c:identifier="atk_no_op_object_factory_new">
-      <return-value>
-        <type name="AtkObjectFactory*" c:type="AtkObjectFactory*"/>
-      </return-value>
-    </function>
-    <class name="Registry"
-           c:type="AtkRegistry"
-           parent="GLib.Object"
-           glib:type-name="AtkRegistry"
-           glib:get-type="atk_registry_get_type">
-      <method name="set_factory_type"
-              c:identifier="atk_registry_set_factory_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-          <parameter name="factory_type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_factory_type"
-              c:identifier="atk_registry_get_factory_type">
-        <return-value>
-          <type name="GType" c:type="GType"/>
-        </return-value>
-        <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_factory" c:identifier="atk_registry_get_factory">
-        <return-value>
-          <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
-        </return-value>
-        <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="get_default_registry"
-              c:identifier="atk_get_default_registry">
-      <return-value>
-        <type name="AtkRegistry*" c:type="AtkRegistry*"/>
-      </return-value>
-    </function>
-    <class name="Relation"
-           c:type="AtkRelation"
-           parent="GLib.Object"
-           glib:type-name="AtkRelation"
-           glib:get-type="atk_relation_get_type">
-      <constructor name="new" c:identifier="atk_relation_new">
-        <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
-        </return-value>
-        <parameters>
-          <parameter name="targets">
-            <type name="Object" c:type="AtkObject**"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="set_get_relation"
-                   c:identifier="atk_relation_set_get_relation">
-        <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="set_get_relation_by_type"
-                   c:identifier="atk_relation_set_get_relation_by_type">
-        <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_relation_type"
-              c:identifier="atk_relation_get_relation_type">
-        <return-value>
-          <type name="RelationType" c:type="AtkRelationType"/>
-        </return-value>
-        <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_target" c:identifier="atk_relation_get_target">
-        <return-value>
-          <type name="GPtrArray" c:type="GPtrArray*"/>
-        </return-value>
-        <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_target" c:identifier="atk_relation_add_target">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="relation-type">
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
-      </property>
-      <property name="target">
-        <type name="GValueArray" c:type="GValueArray"/>
-      </property>
-    </class>
-    <function name="relation_type_register"
-              c:identifier="atk_relation_type_register">
-      <return-value>
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="relation_type_get_name"
-              c:identifier="atk_relation_type_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="RelationType" c:type="AtkRelationType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="relation_type_for_name"
-              c:identifier="atk_relation_type_for_name">
-      <return-value>
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="RelationSet"
-           c:type="AtkRelationSet"
-           parent="GLib.Object"
-           glib:type-name="AtkRelationSet"
-           glib:get-type="atk_relation_set_get_type">
-      <constructor name="new" c:identifier="atk_relation_set_new">
-        <return-value>
-          <type name="RelationSet" c:type="AtkRelationSet*"/>
-        </return-value>
-      </constructor>
-      <method name="contains" c:identifier="atk_relation_set_contains">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove" c:identifier="atk_relation_set_remove">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add" c:identifier="atk_relation_set_add">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_relations"
-              c:identifier="atk_relation_set_get_n_relations">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_relation_by_type"
-              c:identifier="atk_relation_set_add_relation_by_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-    </class>
-    <record name="AtkSelection" c:type="AtkSelection"/>
-    <interface name="Selection"
-               c:type="AtkSelection"
-               glib:type-name="AtkSelection"
-               glib:get-type="atk_selection_get_type">
-      <callback name="add_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="clear_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_selection">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_selection_count">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_child_selected">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="selection_add_selection"
-              c:identifier="atk_selection_add_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_clear_selection"
-              c:identifier="atk_selection_clear_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_ref_selection"
-              c:identifier="atk_selection_ref_selection">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_get_selection_count"
-              c:identifier="atk_selection_get_selection_count">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_is_child_selected"
-              c:identifier="atk_selection_is_child_selected">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_remove_selection"
-              c:identifier="atk_selection_remove_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_select_all_selection"
-              c:identifier="atk_selection_select_all_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="StateSet"
-           c:type="AtkStateSet"
-           parent="GLib.Object"
-           glib:type-name="AtkStateSet"
-           glib:get-type="atk_state_set_get_type">
-      <constructor name="new" c:identifier="atk_state_set_new">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-      </constructor>
-      <constructor name="and_sets" c:identifier="atk_state_set_and_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="or_sets" c:identifier="atk_state_set_or_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="xor_sets" c:identifier="atk_state_set_xor_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="is_empty" c:identifier="atk_state_set_is_empty">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_state" c:identifier="atk_state_set_add_state">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_states" c:identifier="atk_state_set_add_states">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="StateType" c:type="AtkStateType*"/>
-          </parameter>
-          <parameter name="n_types">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="clear_states" c:identifier="atk_state_set_clear_states">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="contains_state" c:identifier="atk_state_set_contains_state">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="contains_states"
-              c:identifier="atk_state_set_contains_states">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="StateType" c:type="AtkStateType*"/>
-          </parameter>
-          <parameter name="n_types">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_state" c:identifier="atk_state_set_remove_state">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="AtkStreamableContent" c:type="AtkStreamableContent"/>
-    <interface name="StreamableContent"
-               c:type="AtkStreamableContent"
-               glib:type-name="AtkStreamableContent"
-               glib:get-type="atk_streamable_content_get_type">
-      <callback name="get_n_mime_types">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_mime_type">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_stream">
-        <return-value>
-          <type name="GIOChannel*" c:type="GIOChannel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_uri">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <field name="pad3" value="AtkFunction"/>
-    </interface>
-    <function name="streamable_content_get_n_mime_types"
-              c:identifier="atk_streamable_content_get_n_mime_types">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="streamable_content_get_mime_type"
-              c:identifier="atk_streamable_content_get_mime_type">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="streamable_content_get_stream"
-              c:identifier="atk_streamable_content_get_stream">
-      <return-value>
-        <type name="GIOChannel*" c:type="GIOChannel*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="mime_type">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="streamable_content_get_uri"
-              c:identifier="atk_streamable_content_get_uri">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="mime_type">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="AtkTable" c:type="AtkTable"/>
-    <interface name="Table"
-               c:type="AtkTable"
-               glib:type-name="AtkTable"
-               glib:get-type="atk_table_get_type">
-      <callback name="ref_at">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_index_at">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_column_at_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_row_at_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_columns">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_rows">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_column_extent_at">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_row_extent_at">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_caption">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_column_description">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_column_header">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_row_description">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_row_header">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_summary">
-        <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_caption">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="caption">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_column_description">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="description">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_column_header">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="header">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_row_description">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="description">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_row_header">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="header">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_summary">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_selected_columns">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="selected">
-            <type name="gint**" c:type="gint**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_selected_rows">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="selected">
-            <type name="gint**" c:type="gint**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_column_selected">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_row_selected">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_selected">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_row_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_row_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_column_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_column_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="num_inserted">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="column_inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="num_inserted">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="num_deleted">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="column_deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="num_deleted">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="column_reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="model_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-      <field name="pad3" value="AtkFunction"/>
-      <field name="pad4" value="AtkFunction"/>
-      <glib:signal name="row-inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="column-inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="column-deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="column-reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="model-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="table_ref_at" c:identifier="atk_table_ref_at">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_index_at" c:identifier="atk_table_get_index_at">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_column_at_index"
-              c:identifier="atk_table_get_column_at_index">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_row_at_index"
-              c:identifier="atk_table_get_row_at_index">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_n_columns" c:identifier="atk_table_get_n_columns">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_n_rows" c:identifier="atk_table_get_n_rows">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_column_extent_at"
-              c:identifier="atk_table_get_column_extent_at">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_row_extent_at"
-              c:identifier="atk_table_get_row_extent_at">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_caption" c:identifier="atk_table_get_caption">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_column_description"
-              c:identifier="atk_table_get_column_description">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_column_header"
-              c:identifier="atk_table_get_column_header">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_row_description"
-              c:identifier="atk_table_get_row_description">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_row_header"
-              c:identifier="atk_table_get_row_header">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_summary" c:identifier="atk_table_get_summary">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_caption" c:identifier="atk_table_set_caption">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="caption">
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_column_description"
-              c:identifier="atk_table_set_column_description">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="description">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_column_header"
-              c:identifier="atk_table_set_column_header">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="header">
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_row_description"
-              c:identifier="atk_table_set_row_description">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="description">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_row_header"
-              c:identifier="atk_table_set_row_header">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="header">
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_set_summary" c:identifier="atk_table_set_summary">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="accessible">
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_selected_columns"
-              c:identifier="atk_table_get_selected_columns">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="selected">
-          <type name="gint" c:type="gint**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_get_selected_rows"
-              c:identifier="atk_table_get_selected_rows">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="selected">
-          <type name="gint" c:type="gint**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_is_column_selected"
-              c:identifier="atk_table_is_column_selected">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_is_row_selected"
-              c:identifier="atk_table_is_row_selected">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_is_selected" c:identifier="atk_table_is_selected">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_add_row_selection"
-              c:identifier="atk_table_add_row_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_remove_row_selection"
-              c:identifier="atk_table_remove_row_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_add_column_selection"
-              c:identifier="atk_table_add_column_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="table_remove_column_selection"
-              c:identifier="atk_table_remove_column_selection">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="Table" c:type="AtkTable*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Misc"
-           c:type="AtkMisc"
-           parent="GLib.Object"
-           glib:type-name="AtkMisc"
-           glib:get-type="atk_misc_get_type">
-      <constructor name="get_instance" c:identifier="atk_misc_get_instance">
-        <return-value>
-          <type name="Misc" c:type="AtkMisc*"/>
-        </return-value>
-      </constructor>
-      <method name="threads_enter" c:identifier="atk_misc_threads_enter">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="AtkMisc*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="threads_leave" c:identifier="atk_misc_threads_leave">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="AtkMisc*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="threads_enter">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="misc">
-            <type name="AtkMisc*" c:type="AtkMisc*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="threads_leave">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="misc">
-            <type name="AtkMisc*" c:type="AtkMisc*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="vfuncs" value="gpointer"/>
-    </class>
-    <record name="AtkValue" c:type="AtkValue"/>
-    <interface name="Value"
-               c:type="AtkValue"
-               glib:type-name="AtkValue"
-               glib:get-type="atk_value_get_type">
-      <callback name="get_current_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_maximum_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_minimum_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_current_value">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_minimum_increment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="pad1" value="AtkFunction"/>
-    </interface>
-    <function name="value_get_current_value"
-              c:identifier="atk_value_get_current_value">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="Value" c:type="AtkValue*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_maximum_value"
-              c:identifier="atk_value_get_maximum_value">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="Value" c:type="AtkValue*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_minimum_value"
-              c:identifier="atk_value_get_minimum_value">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="Value" c:type="AtkValue*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_set_current_value"
-              c:identifier="atk_value_set_current_value">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="Value" c:type="AtkValue*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="value_get_minimum_increment"
-              c:identifier="atk_value_get_minimum_increment">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="Value" c:type="AtkValue*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="GObjectAccessible"
-           c:type="AtkGObjectAccessible"
-           parent="Object"
-           glib:type-name="AtkGObjectAccessible"
-           glib:get-type="atk_gobject_accessible_get_type">
-      <method name="get_object"
-              c:identifier="atk_gobject_accessible_get_object">
-        <return-value>
-          <type name="GLib.Object" c:type="GObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="GObjectAccessible" c:type="AtkGObjectAccessible*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <field name="pad1" value="AtkFunction"/>
-      <field name="pad2" value="AtkFunction"/>
-    </class>
-    <function name="gobject_accessible_for_object"
-              c:identifier="atk_gobject_accessible_for_object">
-      <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="GLib.Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-  </namespace>
-</repository>
diff --git a/gir-repository/gir/cairo.gir b/gir-repository/gir/cairo.gir
index 4cf8aec..af0e400 100644
--- a/gir-repository/gir/cairo.gir
+++ b/gir-repository/gir/cairo.gir
@@ -16,12 +16,24 @@
     <record name="cairo_t" c:type="cairo_t"/>
     <record name="cairo_surface_t" c:type="cairo_surface_t"/>
     <record name="cairo_matrix" c:type="_cairo_matrix">
-      <field name="xx" value="double"/>
-      <field name="yx" value="double"/>
-      <field name="xy" value="double"/>
-      <field name="yy" value="double"/>
-      <field name="x0" value="double"/>
-      <field name="y0" value="double"/>
+      <field name="xx">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="yx">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="xy">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="yy">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="x0">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="y0">
+        <type name="double" c:type="double"/>
+      </field>
     </record>
     <record name="cairo_matrix_t" c:type="cairo_matrix_t"/>
     <record name="cairo_pattern_t" c:type="cairo_pattern_t"/>
@@ -36,7 +48,9 @@
       </parameters>
     </callback>
     <record name="cairo_user_data_key" c:type="_cairo_user_data_key">
-      <field name="unused" value="int"/>
+      <field name="unused">
+        <type name="int" c:type="int"/>
+      </field>
     </record>
     <record name="cairo_user_data_key_t" c:type="cairo_user_data_key_t"/>
     <callback name="cairo_write_func_t">
@@ -1040,16 +1054,30 @@
       </parameters>
     </function>
     <record name="cairo_rectangle" c:type="_cairo_rectangle">
-      <field name="x" value="double"/>
-      <field name="y" value="double"/>
-      <field name="width" value="double"/>
-      <field name="height" value="double"/>
+      <field name="x">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="y">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="width">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="height">
+        <type name="double" c:type="double"/>
+      </field>
     </record>
     <record name="cairo_rectangle_t" c:type="cairo_rectangle_t"/>
     <record name="cairo_rectangle_list" c:type="_cairo_rectangle_list">
-      <field name="status" value="cairo_status_t"/>
-      <field name="rectangles" value="cairo_rectangle_t*"/>
-      <field name="num_rectangles" value="int"/>
+      <field name="status">
+        <type name="cairo_status_t" c:type="cairo_status_t"/>
+      </field>
+      <field name="rectangles">
+        <type name="cairo_rectangle_t*" c:type="cairo_rectangle_t*"/>
+      </field>
+      <field name="num_rectangles">
+        <type name="int" c:type="int"/>
+      </field>
     </record>
     <record name="cairo_rectangle_list_t" c:type="cairo_rectangle_list_t"/>
     <function name="copy_clip_rectangle_list"
@@ -1964,9 +1992,15 @@
       </parameters>
     </function>
     <record name="cairo_path" c:type="cairo_path">
-      <field name="status" value="cairo_status_t"/>
-      <field name="data" value="cairo_path_data_t*"/>
-      <field name="num_data" value="int"/>
+      <field name="status">
+        <type name="cairo_status_t" c:type="cairo_status_t"/>
+      </field>
+      <field name="data">
+        <type name="cairo_path_data_t*" c:type="cairo_path_data_t*"/>
+      </field>
+      <field name="num_data">
+        <type name="int" c:type="int"/>
+      </field>
     </record>
     <record name="cairo_path_t" c:type="cairo_path_t"/>
     <function name="copy_path" c:identifier="cairo_copy_path">
@@ -3138,6 +3172,17 @@
         </parameter>
       </parameters>
     </function>
+    <function name="glitz_surface_create"
+              c:identifier="cairo_glitz_surface_create">
+      <return-value>
+        <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+      </return-value>
+      <parameters>
+        <parameter name="surface">
+          <type name="glitz_surface_t" c:type="glitz_surface_t*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="pdf_surface_create" c:identifier="cairo_pdf_surface_create">
       <return-value>
         <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
diff --git a/gir-repository/gir/gdk-x11-2.0.gir b/gir-repository/gir/gdk-x11-2.0.gir
index 99881ea..4da0077 100644
--- a/gir-repository/gir/gdk-x11-2.0.gir
+++ b/gir-repository/gir/gdk-x11-2.0.gir
@@ -4,19 +4,37 @@
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
   <namespace name="Gdk">
     <record name="GdkPoint" c:type="GdkPoint">
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GdkSegment" c:type="GdkSegment">
-      <field name="x1" value="gint"/>
-      <field name="y1" value="gint"/>
-      <field name="x2" value="gint"/>
-      <field name="y2" value="gint"/>
+      <field name="x1">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y1">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="x2">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y2">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GdkSpan" c:type="GdkSpan">
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="width" value="gint"/>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GdkRegion" c:type="GdkRegion"/>
     <record name="GdkBitmap" c:type="GdkBitmap"/>
@@ -858,17 +876,31 @@
       </parameters>
     </function>
     <record name="GdkDeviceKey" c:type="GdkDeviceKey">
-      <field name="keyval" value="guint"/>
-      <field name="modifiers" value="GdkModifierType"/>
+      <field name="keyval">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="modifiers">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
     </record>
     <record name="GdkDeviceAxis" c:type="GdkDeviceAxis">
-      <field name="use" value="GdkAxisUse"/>
-      <field name="min" value="gdouble"/>
-      <field name="max" value="gdouble"/>
+      <field name="use">
+        <type name="GdkAxisUse" c:type="GdkAxisUse"/>
+      </field>
+      <field name="min">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="max">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <record name="GdkTimeCoord" c:type="GdkTimeCoord">
-      <field name="time" value="guint32"/>
-      <field name="axes" value="gdouble"/>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="axes">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <enumeration name="ExtensionMode"
                  c:type="GdkExtensionMode"
@@ -1128,186 +1160,470 @@
       </parameters>
     </function>
     <record name="GdkEventAny" c:type="GdkEventAny">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
     </record>
     <record name="GdkEventExpose" c:type="GdkEventExpose">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="area" value="GdkRectangle"/>
-      <field name="region" value="GdkRegion*"/>
-      <field name="count" value="gint"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="area">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="region">
+        <type name="GdkRegion*" c:type="GdkRegion*"/>
+      </field>
+      <field name="count">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GdkEventNoExpose" c:type="GdkEventNoExpose">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
     </record>
     <record name="GdkEventVisibility" c:type="GdkEventVisibility">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="state" value="GdkVisibilityState"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="state">
+        <type name="GdkVisibilityState" c:type="GdkVisibilityState"/>
+      </field>
     </record>
     <record name="GdkEventMotion" c:type="GdkEventMotion">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="time" value="guint32"/>
-      <field name="x" value="gdouble"/>
-      <field name="y" value="gdouble"/>
-      <field name="axes" value="gdouble*"/>
-      <field name="state" value="guint"/>
-      <field name="is_hint" value="gint16"/>
-      <field name="device" value="GdkDevice*"/>
-      <field name="x_root" value="gdouble"/>
-      <field name="y_root" value="gdouble"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="axes">
+        <type name="gdouble*" c:type="gdouble*"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_hint">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="device">
+        <type name="GdkDevice*" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <record name="GdkEventButton" c:type="GdkEventButton">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="time" value="guint32"/>
-      <field name="x" value="gdouble"/>
-      <field name="y" value="gdouble"/>
-      <field name="axes" value="gdouble*"/>
-      <field name="state" value="guint"/>
-      <field name="button" value="guint"/>
-      <field name="device" value="GdkDevice*"/>
-      <field name="x_root" value="gdouble"/>
-      <field name="y_root" value="gdouble"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="axes">
+        <type name="gdouble*" c:type="gdouble*"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="button">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="device">
+        <type name="GdkDevice*" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <record name="GdkEventScroll" c:type="GdkEventScroll">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="time" value="guint32"/>
-      <field name="x" value="gdouble"/>
-      <field name="y" value="gdouble"/>
-      <field name="state" value="guint"/>
-      <field name="direction" value="GdkScrollDirection"/>
-      <field name="device" value="GdkDevice*"/>
-      <field name="x_root" value="gdouble"/>
-      <field name="y_root" value="gdouble"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="direction">
+        <type name="GdkScrollDirection" c:type="GdkScrollDirection"/>
+      </field>
+      <field name="device">
+        <type name="GdkDevice*" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <record name="GdkEventKey" c:type="GdkEventKey">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="time" value="guint32"/>
-      <field name="state" value="guint"/>
-      <field name="keyval" value="guint"/>
-      <field name="length" value="gint"/>
-      <field name="string" value="gchar*"/>
-      <field name="hardware_keycode" value="guint16"/>
-      <field name="group" value="guint8"/>
-      <field name="is_modifier" value="guint"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="keyval">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="length">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="string">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="hardware_keycode">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="group">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="is_modifier">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GdkEventFocus" c:type="GdkEventFocus">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="in" value="gint16"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="in">
+        <type name="gint16" c:type="gint16"/>
+      </field>
     </record>
     <record name="GdkEventCrossing" c:type="GdkEventCrossing">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="subwindow" value="GdkWindow*"/>
-      <field name="time" value="guint32"/>
-      <field name="x" value="gdouble"/>
-      <field name="y" value="gdouble"/>
-      <field name="x_root" value="gdouble"/>
-      <field name="y_root" value="gdouble"/>
-      <field name="mode" value="GdkCrossingMode"/>
-      <field name="detail" value="GdkNotifyType"/>
-      <field name="focus" value="gboolean"/>
-      <field name="state" value="guint"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="subwindow">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="x_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="mode">
+        <type name="GdkCrossingMode" c:type="GdkCrossingMode"/>
+      </field>
+      <field name="detail">
+        <type name="GdkNotifyType" c:type="GdkNotifyType"/>
+      </field>
+      <field name="focus">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GdkEventConfigure" c:type="GdkEventConfigure">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="width" value="gint"/>
-      <field name="height" value="gint"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GdkEventProperty" c:type="GdkEventProperty">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="atom" value="GdkAtom"/>
-      <field name="time" value="guint32"/>
-      <field name="state" value="guint"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="atom">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="state">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GdkEventSelection" c:type="GdkEventSelection">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="selection" value="GdkAtom"/>
-      <field name="target" value="GdkAtom"/>
-      <field name="property" value="GdkAtom"/>
-      <field name="time" value="guint32"/>
-      <field name="requestor" value="GdkNativeWindow"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="selection">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="target">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="property">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="requestor">
+        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+      </field>
     </record>
     <record name="GdkEventOwnerChange" c:type="GdkEventOwnerChange">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="owner" value="GdkNativeWindow"/>
-      <field name="reason" value="GdkOwnerChange"/>
-      <field name="selection" value="GdkAtom"/>
-      <field name="time" value="guint32"/>
-      <field name="selection_time" value="guint32"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="owner">
+        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+      </field>
+      <field name="reason">
+        <type name="GdkOwnerChange" c:type="GdkOwnerChange"/>
+      </field>
+      <field name="selection">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="selection_time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
     </record>
     <record name="GdkEventProximity" c:type="GdkEventProximity">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="time" value="guint32"/>
-      <field name="device" value="GdkDevice*"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="device">
+        <type name="GdkDevice*" c:type="GdkDevice*"/>
+      </field>
     </record>
     <record name="GdkEventClient" c:type="GdkEventClient">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="message_type" value="GdkAtom"/>
-      <field name="data_format" value="gushort"/>
-      <field name="data" value="???"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="message_type">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="data_format">
+        <type name="gushort" c:type="gushort"/>
+      </field>
+      <field name="data">
+        <type name="???" c:type="???"/>
+      </field>
     </record>
     <record name="GdkEventDND" c:type="GdkEventDND">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="context" value="GdkDragContext*"/>
-      <field name="time" value="guint32"/>
-      <field name="x_root" value="gshort"/>
-      <field name="y_root" value="gshort"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="context">
+        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+      </field>
+      <field name="time">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="x_root">
+        <type name="gshort" c:type="gshort"/>
+      </field>
+      <field name="y_root">
+        <type name="gshort" c:type="gshort"/>
+      </field>
     </record>
     <record name="GdkEventWindowState" c:type="GdkEventWindowState">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="changed_mask" value="GdkWindowState"/>
-      <field name="new_window_state" value="GdkWindowState"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="changed_mask">
+        <type name="GdkWindowState" c:type="GdkWindowState"/>
+      </field>
+      <field name="new_window_state">
+        <type name="GdkWindowState" c:type="GdkWindowState"/>
+      </field>
     </record>
     <record name="GdkEventSetting" c:type="GdkEventSetting">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="action" value="GdkSettingAction"/>
-      <field name="name" value="char*"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="action">
+        <type name="GdkSettingAction" c:type="GdkSettingAction"/>
+      </field>
+      <field name="name">
+        <type name="char*" c:type="char*"/>
+      </field>
     </record>
     <record name="GdkEventGrabBroken" c:type="GdkEventGrabBroken">
-      <field name="type" value="GdkEventType"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="send_event" value="gint8"/>
-      <field name="keyboard" value="gboolean"/>
-      <field name="implicit" value="gboolean"/>
-      <field name="grab_window" value="GdkWindow*"/>
+      <field name="type">
+        <type name="GdkEventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="gint8" c:type="gint8"/>
+      </field>
+      <field name="keyboard">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
+      <field name="implicit">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
+      <field name="grab_window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
     </record>
     <callback name="GdkEventFunc">
       <return-value>
@@ -1504,6 +1820,10 @@
                 value="35"
                 c:identifier="GDK_GRAB_BROKEN"
                 glib:nick="grab-broken"/>
+      <member name="damage"
+                value="36"
+                c:identifier="GDK_DAMAGE"
+                glib:nick="damage"/>
     </enumeration>
     <bitfield name="EventMask"
               c:type="GdkEventMask"
@@ -2732,9 +3052,15 @@
       </method>
     </class>
     <record name="GdkRgbCmap" c:type="GdkRgbCmap">
-      <field name="colors" value="guint32"/>
-      <field name="n_colors" value="gint"/>
-      <field name="info_list" value="GSList*"/>
+      <field name="colors">
+        <type name="guint32" c:type="guint32"/>
+      </field>
+      <field name="n_colors">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="info_list">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
     </record>
     <function name="rgb_init" c:identifier="gdk_rgb_init">
       <return-value>
@@ -3935,24 +4261,60 @@
       </glib:signal>
     </class>
     <record name="GdkGCValues" c:type="GdkGCValues">
-      <field name="foreground" value="GdkColor"/>
-      <field name="background" value="GdkColor"/>
-      <field name="font" value="GdkFont*"/>
-      <field name="function" value="GdkFunction"/>
-      <field name="fill" value="GdkFill"/>
-      <field name="tile" value="GdkPixmap*"/>
-      <field name="stipple" value="GdkPixmap*"/>
-      <field name="clip_mask" value="GdkPixmap*"/>
-      <field name="subwindow_mode" value="GdkSubwindowMode"/>
-      <field name="ts_x_origin" value="gint"/>
-      <field name="ts_y_origin" value="gint"/>
-      <field name="clip_x_origin" value="gint"/>
-      <field name="clip_y_origin" value="gint"/>
-      <field name="graphics_exposures" value="gint"/>
-      <field name="line_width" value="gint"/>
-      <field name="line_style" value="GdkLineStyle"/>
-      <field name="cap_style" value="GdkCapStyle"/>
-      <field name="join_style" value="GdkJoinStyle"/>
+      <field name="foreground">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="background">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="font">
+        <type name="GdkFont*" c:type="GdkFont*"/>
+      </field>
+      <field name="function">
+        <type name="GdkFunction" c:type="GdkFunction"/>
+      </field>
+      <field name="fill">
+        <type name="GdkFill" c:type="GdkFill"/>
+      </field>
+      <field name="tile">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="stipple">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="clip_mask">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="subwindow_mode">
+        <type name="GdkSubwindowMode" c:type="GdkSubwindowMode"/>
+      </field>
+      <field name="ts_x_origin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="ts_y_origin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="clip_x_origin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="clip_y_origin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="graphics_exposures">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="line_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="line_style">
+        <type name="GdkLineStyle" c:type="GdkLineStyle"/>
+      </field>
+      <field name="cap_style">
+        <type name="GdkCapStyle" c:type="GdkCapStyle"/>
+      </field>
+      <field name="join_style">
+        <type name="GdkJoinStyle" c:type="GdkJoinStyle"/>
+      </field>
     </record>
     <enumeration name="CapStyle"
                  c:type="GdkCapStyle"
@@ -4634,12 +4996,24 @@
       </callback>
     </class>
     <record name="GdkTrapezoid" c:type="GdkTrapezoid">
-      <field name="y1" value="double"/>
-      <field name="x11" value="double"/>
-      <field name="x21" value="double"/>
-      <field name="y2" value="double"/>
-      <field name="x12" value="double"/>
-      <field name="x22" value="double"/>
+      <field name="y1">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="x11">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="x21">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="y2">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="x12">
+        <type name="double" c:type="double"/>
+      </field>
+      <field name="x22">
+        <type name="double" c:type="double"/>
+      </field>
     </record>
     <class name="Drawable"
            c:type="GdkDrawable"
@@ -6972,9 +7346,15 @@
       </method>
     </class>
     <record name="GdkKeymapKey" c:type="GdkKeymapKey">
-      <field name="keycode" value="guint"/>
-      <field name="group" value="gint"/>
-      <field name="level" value="gint"/>
+      <field name="keycode">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="group">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="level">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="Keymap"
            c:type="GdkKeymap"
@@ -7401,16 +7781,28 @@
       </parameters>
     </function>
     <record name="GdkPangoAttrStipple" c:type="GdkPangoAttrStipple">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="stipple" value="GdkBitmap*"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="stipple">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
     </record>
     <record name="GdkPangoAttrEmbossed" c:type="GdkPangoAttrEmbossed">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="embossed" value="gboolean"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="embossed">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
     </record>
     <record name="GdkPangoAttrEmbossColor" c:type="GdkPangoAttrEmbossColor">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="color" value="PangoColor"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="color">
+        <type name="PangoColor" c:type="PangoColor"/>
+      </field>
     </record>
     <function name="pango_attr_stipple_new"
               c:identifier="gdk_pango_attr_stipple_new">
@@ -7446,9 +7838,15 @@
       </parameters>
     </function>
     <record name="GdkPixmapObject" c:type="GdkPixmapObject">
-      <field name="parent_instance" value="GdkDrawable"/>
-      <field name="impl" value="GdkDrawable*"/>
-      <field name="depth" value="gint"/>
+      <field name="parent_instance">
+        <type name="GdkDrawable" c:type="GdkDrawable"/>
+      </field>
+      <field name="impl">
+        <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+      </field>
+      <field name="depth">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="Pixmap"
            c:type="GdkPixmap"
@@ -9003,34 +9401,86 @@
       </parameters>
     </function>
     <record name="GdkGeometry" c:type="GdkGeometry">
-      <field name="min_width" value="gint"/>
-      <field name="min_height" value="gint"/>
-      <field name="max_width" value="gint"/>
-      <field name="max_height" value="gint"/>
-      <field name="base_width" value="gint"/>
-      <field name="base_height" value="gint"/>
-      <field name="width_inc" value="gint"/>
-      <field name="height_inc" value="gint"/>
-      <field name="min_aspect" value="gdouble"/>
-      <field name="max_aspect" value="gdouble"/>
-      <field name="win_gravity" value="GdkGravity"/>
+      <field name="min_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="min_height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="max_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="max_height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="base_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="base_height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="width_inc">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height_inc">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="min_aspect">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="max_aspect">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="win_gravity">
+        <type name="GdkGravity" c:type="GdkGravity"/>
+      </field>
     </record>
     <record name="GdkWindowAttr" c:type="GdkWindowAttr">
-      <field name="title" value="gchar*"/>
-      <field name="event_mask" value="gint"/>
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="width" value="gint"/>
-      <field name="height" value="gint"/>
-      <field name="wclass" value="GdkWindowClass"/>
-      <field name="visual" value="GdkVisual*"/>
-      <field name="colormap" value="GdkColormap*"/>
-      <field name="window_type" value="GdkWindowType"/>
-      <field name="cursor" value="GdkCursor*"/>
-      <field name="wmclass_name" value="gchar*"/>
-      <field name="wmclass_class" value="gchar*"/>
-      <field name="override_redirect" value="gboolean"/>
-      <field name="type_hint" value="GdkWindowTypeHint"/>
+      <field name="title">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="event_mask">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="wclass">
+        <type name="GdkWindowClass" c:type="GdkWindowClass"/>
+      </field>
+      <field name="visual">
+        <type name="GdkVisual*" c:type="GdkVisual*"/>
+      </field>
+      <field name="colormap">
+        <type name="GdkColormap*" c:type="GdkColormap*"/>
+      </field>
+      <field name="window_type">
+        <type name="GdkWindowType" c:type="GdkWindowType"/>
+      </field>
+      <field name="cursor">
+        <type name="GdkCursor*" c:type="GdkCursor*"/>
+      </field>
+      <field name="wmclass_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="wmclass_class">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="override_redirect">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
+      <field name="type_hint">
+        <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
+      </field>
     </record>
     <record name="GdkPointerHooks" c:type="GdkPointerHooks">
       <callback name="get_pointer">
@@ -9071,35 +9521,93 @@
     </record>
     <record name="GdkWindowRedirect" c:type="GdkWindowRedirect"/>
     <record name="GdkWindowObject" c:type="GdkWindowObject">
-      <field name="parent_instance" value="GdkDrawable"/>
-      <field name="impl" value="GdkDrawable*"/>
-      <field name="parent" value="GdkWindowObject*"/>
-      <field name="user_data" value="gpointer"/>
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="extension_events" value="gint"/>
-      <field name="filters" value="GList*"/>
-      <field name="children" value="GList*"/>
-      <field name="bg_color" value="GdkColor"/>
-      <field name="bg_pixmap" value="GdkPixmap*"/>
-      <field name="paint_stack" value="GSList*"/>
-      <field name="update_area" value="GdkRegion*"/>
-      <field name="update_freeze_count" value="guint"/>
-      <field name="window_type" value="guint8"/>
-      <field name="depth" value="guint8"/>
-      <field name="resize_count" value="guint8"/>
-      <field name="state" value="GdkWindowState"/>
-      <field name="guffaw_gravity" value="guint"/>
-      <field name="input_only" value="guint"/>
-      <field name="modal_hint" value="guint"/>
-      <field name="composited" value="guint"/>
-      <field name="destroyed" value="guint"/>
-      <field name="accept_focus" value="guint"/>
-      <field name="focus_on_map" value="guint"/>
-      <field name="shaped" value="guint"/>
-      <field name="event_mask" value="GdkEventMask"/>
-      <field name="update_and_descendants_freeze_count" value="guint"/>
-      <field name="redirect" value="GdkWindowRedirect*"/>
+      <field name="parent_instance">
+        <type name="GdkDrawable" c:type="GdkDrawable"/>
+      </field>
+      <field name="impl">
+        <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+      </field>
+      <field name="parent">
+        <type name="GdkWindowObject*" c:type="GdkWindowObject*"/>
+      </field>
+      <field name="user_data">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="extension_events">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="filters">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="children">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="bg_color">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="bg_pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="paint_stack">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="update_area">
+        <type name="GdkRegion*" c:type="GdkRegion*"/>
+      </field>
+      <field name="update_freeze_count">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="window_type">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="depth">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="resize_count">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="state">
+        <type name="GdkWindowState" c:type="GdkWindowState"/>
+      </field>
+      <field name="guffaw_gravity">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="input_only">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="modal_hint">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="composited">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="destroyed">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="accept_focus">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="focus_on_map">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="shaped">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="event_mask">
+        <type name="GdkEventMask" c:type="GdkEventMask"/>
+      </field>
+      <field name="update_and_descendants_freeze_count">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="redirect">
+        <type name="GdkWindowRedirect*" c:type="GdkWindowRedirect*"/>
+      </field>
     </record>
     <class name="Window"
            c:type="GdkWindow"
diff --git a/gir-repository/gir/gtk-x11-2.0.gir b/gir-repository/gir/gtk-x11-2.0.gir
index cf7d610..e5bdd22 100644
--- a/gir-repository/gir/gtk-x11-2.0.gir
+++ b/gir-repository/gir/gtk-x11-2.0.gir
@@ -1200,14 +1200,26 @@
                 glib:nick="mask"/>
     </bitfield>
     <record name="GtkAccelKey" c:type="GtkAccelKey">
-      <field name="accel_key" value="guint"/>
-      <field name="accel_mods" value="GdkModifierType"/>
-      <field name="accel_flags" value="guint"/>
+      <field name="accel_key">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="accel_mods">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="accel_flags">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkAccelGroupEntry" c:type="GtkAccelGroupEntry">
-      <field name="key" value="GtkAccelKey"/>
-      <field name="closure" value="GClosure*"/>
-      <field name="accel_path_quark" value="GQuark"/>
+      <field name="key">
+        <type name="GtkAccelKey" c:type="GtkAccelKey"/>
+      </field>
+      <field name="closure">
+        <type name="GClosure*" c:type="GClosure*"/>
+      </field>
+      <field name="accel_path_quark">
+        <type name="GQuark" c:type="GQuark"/>
+      </field>
     </record>
     <callback name="GtkAccelGroupActivate">
       <return-value>
@@ -1653,32 +1665,36 @@
                  c:type="GtkBuilderError"
                  glib:type-name="GtkBuilderError"
                  glib:get-type="gtk_builder_error_get_type">
-      <member name="invalid-type-function"
+      <member name="version-mismatch"
                 value="0"
+                c:identifier="GTK_BUILDER_ERROR_VERSION_MISMATCH"
+                glib:nick="version-mismatch"/>
+      <member name="invalid-type-function"
+                value="1"
                 c:identifier="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION"
                 glib:nick="invalid-type-function"/>
       <member name="unhandled-tag"
-                value="1"
+                value="2"
                 c:identifier="GTK_BUILDER_ERROR_UNHANDLED_TAG"
                 glib:nick="unhandled-tag"/>
       <member name="missing-attribute"
-                value="2"
+                value="3"
                 c:identifier="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE"
                 glib:nick="missing-attribute"/>
       <member name="invalid-attribute"
-                value="3"
+                value="4"
                 c:identifier="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE"
                 glib:nick="invalid-attribute"/>
       <member name="invalid-tag"
-                value="4"
+                value="5"
                 c:identifier="GTK_BUILDER_ERROR_INVALID_TAG"
                 glib:nick="invalid-tag"/>
       <member name="missing-property-value"
-                value="5"
+                value="6"
                 c:identifier="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE"
                 glib:nick="missing-property-value"/>
       <member name="invalid-value"
-                value="6"
+                value="7"
                 c:identifier="GTK_BUILDER_ERROR_INVALID_VALUE"
                 glib:nick="invalid-value"/>
     </enumeration>
@@ -2023,6 +2039,10 @@
                 value="8"
                 c:identifier="GTK_ICON_LOOKUP_GENERIC_FALLBACK"
                 glib:nick="generic-fallback"/>
+      <member name="force-size"
+                value="16"
+                c:identifier="GTK_ICON_LOOKUP_FORCE_SIZE"
+                glib:nick="force-size"/>
     </bitfield>
     <enumeration name="IconThemeError"
                  c:type="GtkIconThemeError"
@@ -2102,6 +2122,10 @@
                 value="7"
                 c:identifier="GTK_IMAGE_ICON_NAME"
                 glib:nick="icon-name"/>
+      <member name="gicon"
+                value="8"
+                c:identifier="GTK_IMAGE_GICON"
+                glib:nick="gicon"/>
     </enumeration>
     <enumeration name="MessageType"
                  c:type="GtkMessageType"
@@ -3210,13 +3234,23 @@
                 glib:nick="toggle-recursive"/>
     </enumeration>
     <record name="GtkArg" c:type="GtkArg">
-      <field name="type" value="GtkType"/>
-      <field name="name" value="gchar*"/>
-      <field name="d" value="???"/>
+      <field name="type">
+        <type name="GtkType" c:type="GtkType"/>
+      </field>
+      <field name="name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="d">
+        <type name="???" c:type="???"/>
+      </field>
     </record>
     <record name="GtkObject" c:type="GtkObject">
-      <field name="parent_instance" value="GInitiallyUnowned"/>
-      <field name="flags" value="guint32"/>
+      <field name="parent_instance">
+        <type name="GInitiallyUnowned" c:type="GInitiallyUnowned"/>
+      </field>
+      <field name="flags">
+        <type name="guint32" c:type="guint32"/>
+      </field>
       <callback name="set_arg">
         <return-value>
           <type name="void" c:type="void"/>
@@ -3318,14 +3352,30 @@
       </parameters>
     </callback>
     <record name="GtkTypeInfo" c:type="GtkTypeInfo">
-      <field name="type_name" value="gchar*"/>
-      <field name="object_size" value="guint"/>
-      <field name="class_size" value="guint"/>
-      <field name="class_init_func" value="GtkClassInitFunc"/>
-      <field name="object_init_func" value="GtkObjectInitFunc"/>
-      <field name="reserved_1" value="gpointer"/>
-      <field name="reserved_2" value="gpointer"/>
-      <field name="base_class_init_func" value="GtkClassInitFunc"/>
+      <field name="type_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="object_size">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="class_size">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="class_init_func">
+        <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
+      </field>
+      <field name="object_init_func">
+        <type name="GtkObjectInitFunc" c:type="GtkObjectInitFunc"/>
+      </field>
+      <field name="reserved_1">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="reserved_2">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="base_class_init_func">
+        <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
+      </field>
     </record>
     <function name="type_class" c:identifier="gtk_type_class">
       <return-value>
@@ -3895,10 +3945,18 @@
     </function>
     <record name="GtkThemeEngine" c:type="GtkThemeEngine"/>
     <record name="GtkRcProperty" c:type="GtkRcProperty">
-      <field name="type_name" value="GQuark"/>
-      <field name="property_name" value="GQuark"/>
-      <field name="origin" value="gchar*"/>
-      <field name="value" value="GValue"/>
+      <field name="type_name">
+        <type name="GQuark" c:type="GQuark"/>
+      </field>
+      <field name="property_name">
+        <type name="GQuark" c:type="GQuark"/>
+      </field>
+      <field name="origin">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="GValue" c:type="GValue"/>
+      </field>
     </record>
     <callback name="GtkRcPropertyParser">
       <return-value>
@@ -7239,8 +7297,12 @@
       </parameters>
     </function>
     <record name="GtkSettingsValue" c:type="GtkSettingsValue">
-      <field name="origin" value="gchar*"/>
-      <field name="value" value="GValue"/>
+      <field name="origin">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="GValue" c:type="GValue"/>
+      </field>
     </record>
     <record name="GtkSettingsPropertyValue" c:type="GtkSettingsPropertyValue"/>
     <class name="Settings"
@@ -7479,6 +7541,9 @@
       <property name="gtk-im-module">
         <type name="gchararray" c:type="gchararray"/>
       </property>
+      <property name="gtk-recent-files-max-age">
+        <type name="gint" c:type="gint"/>
+      </property>
     </class>
     <function name="settings_install_property"
               c:identifier="gtk_settings_install_property">
@@ -7661,17 +7726,35 @@
       </parameters>
     </function>
     <record name="GtkWidgetAuxInfo" c:type="GtkWidgetAuxInfo">
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="width" value="gint"/>
-      <field name="height" value="gint"/>
-      <field name="x_set" value="guint"/>
-      <field name="y_set" value="guint"/>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="x_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="y_set">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkWidgetShapeInfo" c:type="GtkWidgetShapeInfo">
-      <field name="offset_x" value="gint16"/>
-      <field name="offset_y" value="gint16"/>
-      <field name="shape_mask" value="GdkBitmap*"/>
+      <field name="offset_x">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="offset_y">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="shape_mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
     </record>
     <callback name="GtkCallback">
       <return-value>
@@ -9446,8 +9529,12 @@
       <property name="tooltip-text">
         <type name="gchararray" c:type="gchararray"/>
       </property>
-      <field name="activate_signal" value="guint"/>
-      <field name="set_scroll_adjustments_signal" value="guint"/>
+      <field name="activate_signal">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="set_scroll_adjustments_signal">
+        <type name="guint" c:type="guint"/>
+      </field>
       <callback name="dispatch_child_properties_changed">
         <return-value>
           <type name="void" c:type="void"/>
@@ -10968,6 +11055,16 @@
           </parameter>
         </parameters>
       </glib:signal>
+      <glib:signal name="damage-event">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GdkEvent" c:type="GdkEvent"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
       <glib:signal name="grab-broken-event">
         <return-value>
           <type name="gboolean" c:type="gboolean"/>
@@ -13246,10 +13343,10 @@
       <property name="title">
         <type name="gchararray" c:type="gchararray"/>
       </property>
-      <property name="role">
+      <property name="startup-id">
         <type name="gchararray" c:type="gchararray"/>
       </property>
-      <property name="startup-id">
+      <property name="role">
         <type name="gchararray" c:type="gchararray"/>
       </property>
       <property name="allow-shrink">
@@ -14765,7 +14862,9 @@
       <property name="take-focus">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <field name="submenu_placement" value="guint"/>
+      <field name="submenu_placement">
+        <type name="guint" c:type="guint"/>
+      </field>
       <callback name="deactivate">
         <return-value>
           <type name="void" c:type="void"/>
@@ -16114,14 +16213,30 @@
       <property name="accel-widget">
         <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
-      <field name="signal_quote1" value="gchar*"/>
-      <field name="signal_quote2" value="gchar*"/>
-      <field name="mod_name_shift" value="gchar*"/>
-      <field name="mod_name_control" value="gchar*"/>
-      <field name="mod_name_alt" value="gchar*"/>
-      <field name="mod_separator" value="gchar*"/>
-      <field name="accel_seperator" value="gchar*"/>
-      <field name="latin1_to_char" value="guint"/>
+      <field name="signal_quote1">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="signal_quote2">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_shift">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_control">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_alt">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mod_separator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="accel_seperator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="latin1_to_char">
+        <type name="guint" c:type="guint"/>
+      </field>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="void" c:type="void"/>
@@ -16826,8 +16941,12 @@
           </parameter>
         </parameters>
       </callback>
-      <field name="menu_item_type" value="GType"/>
-      <field name="toolbar_item_type" value="GType"/>
+      <field name="menu_item_type">
+        <type name="GType" c:type="GType"/>
+      </field>
+      <field name="toolbar_item_type">
+        <type name="GType" c:type="GType"/>
+      </field>
       <callback name="create_menu_item">
         <return-value>
           <type name="GtkWidget*" c:type="GtkWidget*"/>
@@ -16957,29 +17076,67 @@
     </function>
     <record name="GtkActionGroupPrivate" c:type="GtkActionGroupPrivate"/>
     <record name="GtkActionEntry" c:type="GtkActionEntry">
-      <field name="name" value="gchar*"/>
-      <field name="stock_id" value="gchar*"/>
-      <field name="label" value="gchar*"/>
-      <field name="accelerator" value="gchar*"/>
-      <field name="tooltip" value="gchar*"/>
-      <field name="callback" value="GCallback"/>
+      <field name="name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GCallback" c:type="GCallback"/>
+      </field>
     </record>
     <record name="GtkToggleActionEntry" c:type="GtkToggleActionEntry">
-      <field name="name" value="gchar*"/>
-      <field name="stock_id" value="gchar*"/>
-      <field name="label" value="gchar*"/>
-      <field name="accelerator" value="gchar*"/>
-      <field name="tooltip" value="gchar*"/>
-      <field name="callback" value="GCallback"/>
-      <field name="is_active" value="gboolean"/>
+      <field name="name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GCallback" c:type="GCallback"/>
+      </field>
+      <field name="is_active">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
     </record>
     <record name="GtkRadioActionEntry" c:type="GtkRadioActionEntry">
-      <field name="name" value="gchar*"/>
-      <field name="stock_id" value="gchar*"/>
-      <field name="label" value="gchar*"/>
-      <field name="accelerator" value="gchar*"/>
-      <field name="tooltip" value="gchar*"/>
-      <field name="value" value="gint"/>
+      <field name="name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="ActionGroup"
            c:type="GtkActionGroup"
@@ -18233,12 +18390,24 @@
       </return-value>
     </function>
     <record name="GtkBoxChild" c:type="GtkBoxChild">
-      <field name="widget" value="GtkWidget*"/>
-      <field name="padding" value="guint16"/>
-      <field name="expand" value="guint"/>
-      <field name="fill" value="guint"/>
-      <field name="pack" value="guint"/>
-      <field name="is_secondary" value="guint"/>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="padding">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="fill">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pack">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_secondary">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <class name="Box"
            c:type="GtkBox"
@@ -18591,35 +18760,81 @@
       </parameters>
     </function>
     <record name="GtkBindingSet" c:type="GtkBindingSet">
-      <field name="set_name" value="gchar*"/>
-      <field name="priority" value="gint"/>
-      <field name="widget_path_pspecs" value="GSList*"/>
-      <field name="widget_class_pspecs" value="GSList*"/>
-      <field name="class_branch_pspecs" value="GSList*"/>
-      <field name="entries" value="GtkBindingEntry*"/>
-      <field name="current" value="GtkBindingEntry*"/>
-      <field name="parsed" value="guint"/>
+      <field name="set_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="priority">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="widget_path_pspecs">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="widget_class_pspecs">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="class_branch_pspecs">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="entries">
+        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="current">
+        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="parsed">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkBindingEntry" c:type="GtkBindingEntry">
-      <field name="keyval" value="guint"/>
-      <field name="modifiers" value="GdkModifierType"/>
-      <field name="binding_set" value="GtkBindingSet*"/>
-      <field name="destroyed" value="guint"/>
-      <field name="in_emission" value="guint"/>
-      <field name="marks_unbound" value="guint"/>
-      <field name="set_next" value="GtkBindingEntry*"/>
-      <field name="hash_next" value="GtkBindingEntry*"/>
-      <field name="signals" value="GtkBindingSignal*"/>
+      <field name="keyval">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="modifiers">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="binding_set">
+        <type name="GtkBindingSet*" c:type="GtkBindingSet*"/>
+      </field>
+      <field name="destroyed">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="in_emission">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="marks_unbound">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="set_next">
+        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="hash_next">
+        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="signals">
+        <type name="GtkBindingSignal*" c:type="GtkBindingSignal*"/>
+      </field>
     </record>
     <record name="GtkBindingSignal" c:type="GtkBindingSignal">
-      <field name="next" value="GtkBindingSignal*"/>
-      <field name="signal_name" value="gchar*"/>
-      <field name="n_args" value="guint"/>
-      <field name="args" value="GtkBindingArg*"/>
+      <field name="next">
+        <type name="GtkBindingSignal*" c:type="GtkBindingSignal*"/>
+      </field>
+      <field name="signal_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="n_args">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="args">
+        <type name="GtkBindingArg*" c:type="GtkBindingArg*"/>
+      </field>
     </record>
     <record name="GtkBindingArg" c:type="GtkBindingArg">
-      <field name="arg_type" value="GType"/>
-      <field name="d" value="???"/>
+      <field name="arg_type">
+        <type name="GType" c:type="GType"/>
+      </field>
+      <field name="d">
+        <type name="???" c:type="???"/>
+      </field>
     </record>
     <function name="binding_set_new" c:identifier="gtk_binding_set_new">
       <return-value>
@@ -19506,34 +19721,62 @@
       </parameters>
     </function>
     <record name="GtkImagePixmapData" c:type="GtkImagePixmapData">
-      <field name="pixmap" value="GdkPixmap*"/>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
     </record>
     <record name="GtkImageImageData" c:type="GtkImageImageData">
-      <field name="image" value="GdkImage*"/>
+      <field name="image">
+        <type name="GdkImage*" c:type="GdkImage*"/>
+      </field>
     </record>
     <record name="GtkImagePixbufData" c:type="GtkImagePixbufData">
-      <field name="pixbuf" value="GdkPixbuf*"/>
+      <field name="pixbuf">
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+      </field>
     </record>
     <record name="GtkImageStockData" c:type="GtkImageStockData">
-      <field name="stock_id" value="gchar*"/>
+      <field name="stock_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
     </record>
     <record name="GtkImageIconSetData" c:type="GtkImageIconSetData">
-      <field name="icon_set" value="GtkIconSet*"/>
+      <field name="icon_set">
+        <type name="GtkIconSet*" c:type="GtkIconSet*"/>
+      </field>
     </record>
     <record name="GtkImageAnimationData" c:type="GtkImageAnimationData">
-      <field name="anim" value="GdkPixbufAnimation*"/>
-      <field name="iter" value="GdkPixbufAnimationIter*"/>
-      <field name="frame_timeout" value="guint"/>
+      <field name="anim">
+        <type name="GdkPixbufAnimation*" c:type="GdkPixbufAnimation*"/>
+      </field>
+      <field name="iter">
+        <type name="GdkPixbufAnimationIter*" c:type="GdkPixbufAnimationIter*"/>
+      </field>
+      <field name="frame_timeout">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkImageIconNameData" c:type="GtkImageIconNameData">
-      <field name="icon_name" value="gchar*"/>
-      <field name="pixbuf" value="GdkPixbuf*"/>
-      <field name="theme_change_id" value="guint"/>
+      <field name="icon_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="pixbuf">
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+      </field>
+      <field name="theme_change_id">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkImageGIconData" c:type="GtkImageGIconData">
-      <field name="icon" value="GIcon*"/>
-      <field name="pixbuf" value="GdkPixbuf*"/>
-      <field name="theme_change_id" value="guint"/>
+      <field name="icon">
+        <type name="GIcon*" c:type="GIcon*"/>
+      </field>
+      <field name="pixbuf">
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+      </field>
+      <field name="theme_change_id">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <class name="Image"
            c:type="GtkImage"
@@ -19905,6 +20148,9 @@
       <property name="storage-type">
         <type name="GtkImageType" c:type="GtkImageType"/>
       </property>
+      <property name="gicon">
+        <type name="GIcon" c:type="GIcon"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="void" c:type="void"/>
@@ -23819,6 +24065,19 @@
       <property name="has-entry">
         <type name="gboolean" c:type="gboolean"/>
       </property>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="gchararray" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
     <class name="CellRendererPixbuf"
            c:type="GtkCellRendererPixbuf"
@@ -24665,7 +24924,9 @@
       <property name="submenu">
         <type name="GtkMenu" c:type="GtkMenu"/>
       </property>
-      <field name="hide_on_activate" value="guint"/>
+      <field name="hide_on_activate">
+        <type name="guint" c:type="guint"/>
+      </field>
       <callback name="activate">
         <return-value>
           <type name="void" c:type="void"/>
@@ -25355,21 +25616,51 @@
       </glib:signal>
     </class>
     <record name="GtkTextAppearance" c:type="GtkTextAppearance">
-      <field name="bg_color" value="GdkColor"/>
-      <field name="fg_color" value="GdkColor"/>
-      <field name="bg_stipple" value="GdkBitmap*"/>
-      <field name="fg_stipple" value="GdkBitmap*"/>
-      <field name="rise" value="gint"/>
-      <field name="padding1" value="gpointer"/>
-      <field name="underline" value="guint"/>
-      <field name="strikethrough" value="guint"/>
-      <field name="draw_bg" value="guint"/>
-      <field name="inside_selection" value="guint"/>
-      <field name="is_text" value="guint"/>
-      <field name="pad1" value="guint"/>
-      <field name="pad2" value="guint"/>
-      <field name="pad3" value="guint"/>
-      <field name="pad4" value="guint"/>
+      <field name="bg_color">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="fg_color">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="bg_stipple">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="fg_stipple">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="rise">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="padding1">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="underline">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="strikethrough">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="draw_bg">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="inside_selection">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_text">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad1">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad2">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad3">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad4">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <function name="text_attributes_new" c:identifier="gtk_text_attributes_new">
       <return-value>
@@ -26661,14 +26952,26 @@
       </parameters>
     </callback>
     <record name="GtkTargetEntry" c:type="GtkTargetEntry">
-      <field name="target" value="gchar*"/>
-      <field name="flags" value="guint"/>
-      <field name="info" value="guint"/>
+      <field name="target">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="flags">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkTargetPair" c:type="GtkTargetPair">
-      <field name="target" value="GdkAtom"/>
-      <field name="flags" value="guint"/>
-      <field name="info" value="guint"/>
+      <field name="target">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="flags">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <function name="target_list_new" c:identifier="gtk_target_list_new">
       <return-value>
@@ -34680,9 +34983,15 @@
       </parameters>
     </function>
     <record name="GtkFixedChild" c:type="GtkFixedChild">
-      <field name="widget" value="GtkWidget*"/>
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="Fixed"
            c:type="GtkFixed"
@@ -34757,11 +35066,21 @@
       </return-value>
     </function>
     <record name="GtkFileFilterInfo" c:type="GtkFileFilterInfo">
-      <field name="contains" value="GtkFileFilterFlags"/>
-      <field name="filename" value="gchar*"/>
-      <field name="uri" value="gchar*"/>
-      <field name="display_name" value="gchar*"/>
-      <field name="mime_type" value="gchar*"/>
+      <field name="contains">
+        <type name="GtkFileFilterFlags" c:type="GtkFileFilterFlags"/>
+      </field>
+      <field name="filename">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="uri">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="display_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
     </record>
     <callback name="GtkFileFilterFunc">
       <return-value>
@@ -34897,37 +35216,37 @@
                c:type="GtkFileChooser"
                glib:type-name="GtkFileChooser"
                glib:get-type="gtk_file_chooser_get_type">
-      <property name="filter">
-        <type name="GtkFileFilter" c:type="GtkFileFilter"/>
+      <property name="select-multiple">
+        <type name="gboolean" c:type="gboolean"/>
       </property>
       <property name="use-preview-label">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <property name="action">
-        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
+      <property name="file-system-backend">
+        <type name="gchararray" c:type="gchararray"/>
       </property>
       <property name="local-only">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <property name="show-hidden">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="file-system-backend">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="preview-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+      <property name="filter">
+        <type name="GtkFileFilter" c:type="GtkFileFilter"/>
       </property>
       <property name="extra-widget">
         <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
-      <property name="do-overwrite-confirmation">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="action">
+        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
       </property>
       <property name="preview-widget-active">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <property name="select-multiple">
+      <property name="do-overwrite-confirmation">
+        <type name="gboolean" c:type="gboolean"/>
+      </property>
+      <property name="preview-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <property name="show-hidden">
         <type name="gboolean" c:type="gboolean"/>
       </property>
       <glib:signal name="current-folder-changed">
@@ -35699,13 +36018,27 @@
           </parameter>
         </parameters>
       </callback>
-      <field name="__gtk_reserved1" value="void*"/>
-      <field name="__gtk_reserved2" value="void*"/>
-      <field name="__gtk_reserved3" value="void*"/>
-      <field name="__gtk_reserved4" value="void*"/>
-      <field name="__gtk_reserved5" value="void*"/>
-      <field name="__gtk_reserved6" value="void*"/>
-      <field name="__gtk_reserved7" value="void*"/>
+      <field name="__gtk_reserved1">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved2">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved3">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved4">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved5">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved6">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved7">
+        <type name="void*" c:type="void*"/>
+      </field>
       <glib:signal name="file-set">
         <return-value>
           <type name="void" c:type="void"/>
@@ -36812,11 +37145,21 @@
       </return-value>
     </function>
     <record name="GtkRulerMetric" c:type="GtkRulerMetric">
-      <field name="metric_name" value="gchar*"/>
-      <field name="abbrev" value="gchar*"/>
-      <field name="pixels_per_unit" value="gdouble"/>
-      <field name="ruler_scale" value="gdouble"/>
-      <field name="subdivide" value="gint"/>
+      <field name="metric_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="abbrev">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="pixels_per_unit">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="ruler_scale">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
+      <field name="subdivide">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="Ruler"
            c:type="GtkRuler"
@@ -37257,8 +37600,12 @@
       <property name="fill-level">
         <type name="gdouble" c:type="gdouble"/>
       </property>
-      <field name="slider_detail" value="gchar*"/>
-      <field name="stepper_detail" value="gchar*"/>
+      <field name="slider_detail">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="stepper_detail">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
       <callback name="value_changed">
         <return-value>
           <type name="void" c:type="void"/>
@@ -41173,10 +41520,18 @@
       </parameters>
     </function>
     <record name="GtkTooltipsData" c:type="GtkTooltipsData">
-      <field name="tooltips" value="GtkTooltips*"/>
-      <field name="widget" value="GtkWidget*"/>
-      <field name="tip_text" value="gchar*"/>
-      <field name="tip_private" value="gchar*"/>
+      <field name="tooltips">
+        <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="tip_text">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="tip_private">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
     </record>
     <class name="Tooltips"
            c:type="GtkTooltips"
@@ -41873,7 +42228,9 @@
       <property name="icon-widget">
         <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
-      <field name="button_type" value="GType"/>
+      <field name="button_type">
+        <type name="GType" c:type="GType"/>
+      </field>
       <callback name="clicked">
         <return-value>
           <type name="void" c:type="void"/>
@@ -42308,9 +42665,77 @@
         </parameter>
       </parameters>
     </callback>
-    <record name="GtkMountOperation" c:type="GtkMountOperation">
-      <field name="parent_instance" value="GMountOperation"/>
-      <field name="priv" value="GtkMountOperationPrivate*"/>
+    <record name="GtkMountOperationPrivate" c:type="GtkMountOperationPrivate"/>
+    <class name="MountOperation"
+           c:type="GtkMountOperation"
+           parent="GMountOperation"
+           glib:type-name="GtkMountOperation"
+           glib:get-type="gtk_mount_operation_get_type">
+      <method name="is_showing" c:identifier="gtk_mount_operation_is_showing">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_parent" c:identifier="gtk_mount_operation_set_parent">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_parent" c:identifier="gtk_mount_operation_get_parent">
+        <return-value>
+          <type name="Window" c:type="GtkWindow*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_screen" c:identifier="gtk_mount_operation_set_screen">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_screen" c:identifier="gtk_mount_operation_get_screen">
+        <return-value>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="parent">
+        <type name="GtkWindow" c:type="GtkWindow"/>
+      </property>
+      <property name="is-showing">
+        <type name="gboolean" c:type="gboolean"/>
+      </property>
+      <property name="screen">
+        <type name="GtkWindow" c:type="GtkWindow"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="void" c:type="void"/>
@@ -42331,14 +42756,7 @@
           <type name="void" c:type="void"/>
         </return-value>
       </callback>
-    </record>
-    <record name="GtkMountOperationPrivate" c:type="GtkMountOperationPrivate"/>
-    <function name="mount_operation_get_type"
-              c:identifier="gtk_mount_operation_get_type">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-    </function>
+    </class>
     <function name="mount_operation_new" c:identifier="gtk_mount_operation_new">
       <return-value>
         <type name="GMountOperation*" c:type="GMountOperation*"/>
@@ -42349,67 +42767,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="mount_operation_is_showing"
-              c:identifier="gtk_mount_operation_is_showing">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GtkMountOperation" c:type="GtkMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_parent"
-              c:identifier="gtk_mount_operation_set_parent">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GtkMountOperation" c:type="GtkMountOperation*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_parent"
-              c:identifier="gtk_mount_operation_get_parent">
-      <return-value>
-        <type name="GtkWindow*" c:type="GtkWindow*"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GtkMountOperation" c:type="GtkMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_set_screen"
-              c:identifier="gtk_mount_operation_set_screen">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GtkMountOperation" c:type="GtkMountOperation*"/>
-        </parameter>
-        <parameter name="screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="mount_operation_get_screen"
-              c:identifier="gtk_mount_operation_get_screen">
-      <return-value>
-        <type name="GdkScreen*" c:type="GdkScreen*"/>
-      </return-value>
-      <parameters>
-        <parameter name="op">
-          <type name="GtkMountOperation" c:type="GtkMountOperation*"/>
-        </parameter>
-      </parameters>
-    </function>
     <record name="GtkNotebookPage" c:type="GtkNotebookPage"/>
     <callback name="GtkNotebookWindowCreationFunc">
       <return-value>
@@ -44431,8 +44788,12 @@
       </parameters>
     </callback>
     <record name="GtkPageRange" c:type="GtkPageRange">
-      <field name="start" value="gint"/>
-      <field name="end" value="gint"/>
+      <field name="start">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="end">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <class name="PrintSettings"
            c:type="GtkPrintSettings"
@@ -47410,13 +47771,27 @@
       </parameters>
     </function>
     <record name="GtkRecentData" c:type="GtkRecentData">
-      <field name="display_name" value="gchar*"/>
-      <field name="description" value="gchar*"/>
-      <field name="mime_type" value="gchar*"/>
-      <field name="app_name" value="gchar*"/>
-      <field name="app_exec" value="gchar*"/>
-      <field name="groups" value="gchar**"/>
-      <field name="is_private" value="gboolean"/>
+      <field name="display_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="description">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="app_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="app_exec">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="groups">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="is_private">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
     </record>
     <record name="GtkRecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
     <function name="recent_manager_error_quark"
@@ -48007,13 +48382,27 @@
       </parameters>
     </function>
     <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
-      <field name="contains" value="GtkRecentFilterFlags"/>
-      <field name="uri" value="gchar*"/>
-      <field name="display_name" value="gchar*"/>
-      <field name="mime_type" value="gchar*"/>
-      <field name="applications" value="gchar**"/>
-      <field name="groups" value="gchar**"/>
-      <field name="age" value="gint"/>
+      <field name="contains">
+        <type name="GtkRecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+      </field>
+      <field name="uri">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="display_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="applications">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="groups">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="age">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <callback name="GtkRecentFilterFunc">
       <return-value>
@@ -48212,11 +48601,8 @@
                c:type="GtkRecentChooser"
                glib:type-name="GtkRecentChooser"
                glib:get-type="gtk_recent_chooser_get_type">
-      <property name="limit">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="show-private">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="filter">
+        <type name="GtkRecentFilter" c:type="GtkRecentFilter"/>
       </property>
       <property name="show-icons">
         <type name="gboolean" c:type="gboolean"/>
@@ -48227,18 +48613,21 @@
       <property name="local-only">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <property name="show-tips">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
       <property name="recent-manager">
         <type name="GtkRecentManager" c:type="GtkRecentManager"/>
       </property>
-      <property name="filter">
-        <type name="GtkRecentFilter" c:type="GtkRecentFilter"/>
-      </property>
       <property name="show-not-found">
         <type name="gboolean" c:type="gboolean"/>
       </property>
+      <property name="show-tips">
+        <type name="gboolean" c:type="gboolean"/>
+      </property>
+      <property name="show-private">
+        <type name="gboolean" c:type="gboolean"/>
+      </property>
+      <property name="limit">
+        <type name="gint" c:type="gint"/>
+      </property>
       <property name="sort-type">
         <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
       </property>
@@ -49500,7 +49889,9 @@
       <property name="shadow-type">
         <type name="GtkShadowType" c:type="GtkShadowType"/>
       </property>
-      <field name="scrollbar_spacing" value="gint"/>
+      <field name="scrollbar_spacing">
+        <type name="gint" c:type="gint"/>
+      </field>
       <callback name="scroll_child">
         <return-value>
           <type name="gboolean" c:type="gboolean"/>
@@ -50406,7 +50797,9 @@
       <property name="has-resize-grip">
         <type name="gboolean" c:type="gboolean"/>
       </property>
-      <field name="reserved" value="gpointer"/>
+      <field name="reserved">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
       <callback name="text_pushed">
         <return-value>
           <type name="void" c:type="void"/>
@@ -50763,6 +51156,17 @@
           </parameter>
         </parameters>
       </method>
+      <method name="get_x11_window_id"
+              c:identifier="gtk_status_icon_get_x11_window_id">
+        <return-value>
+          <type name="guint32" c:type="guint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
       <property name="pixbuf">
         <type name="GdkPixbuf" c:type="GdkPixbuf"/>
       </property>
@@ -50835,12 +51239,24 @@
           </parameter>
         </parameters>
       </callback>
-      <field name="__gtk_reserved1" value="void*"/>
-      <field name="__gtk_reserved2" value="void*"/>
-      <field name="__gtk_reserved3" value="void*"/>
-      <field name="__gtk_reserved4" value="void*"/>
-      <field name="__gtk_reserved5" value="void*"/>
-      <field name="__gtk_reserved6" value="void*"/>
+      <field name="__gtk_reserved1">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved2">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved3">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved4">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved5">
+        <type name="void*" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved6">
+        <type name="void*" c:type="void*"/>
+      </field>
       <glib:signal name="popup-menu">
         <return-value>
           <type name="void" c:type="void"/>
@@ -50894,11 +51310,21 @@
       </parameters>
     </function>
     <record name="GtkStockItem" c:type="GtkStockItem">
-      <field name="stock_id" value="gchar*"/>
-      <field name="label" value="gchar*"/>
-      <field name="modifier" value="GdkModifierType"/>
-      <field name="keyval" value="guint"/>
-      <field name="translation_domain" value="gchar*"/>
+      <field name="stock_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="modifier">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="keyval">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="translation_domain">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
     </record>
     <function name="stock_add" c:identifier="gtk_stock_add">
       <return-value>
@@ -50985,29 +51411,71 @@
       </parameters>
     </function>
     <record name="GtkTableChild" c:type="GtkTableChild">
-      <field name="widget" value="GtkWidget*"/>
-      <field name="left_attach" value="guint16"/>
-      <field name="right_attach" value="guint16"/>
-      <field name="top_attach" value="guint16"/>
-      <field name="bottom_attach" value="guint16"/>
-      <field name="xpadding" value="guint16"/>
-      <field name="ypadding" value="guint16"/>
-      <field name="xexpand" value="guint"/>
-      <field name="yexpand" value="guint"/>
-      <field name="xshrink" value="guint"/>
-      <field name="yshrink" value="guint"/>
-      <field name="xfill" value="guint"/>
-      <field name="yfill" value="guint"/>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="left_attach">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="right_attach">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="top_attach">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="bottom_attach">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="xpadding">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="ypadding">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="xexpand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yexpand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="xshrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yshrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="xfill">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yfill">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkTableRowCol" c:type="GtkTableRowCol">
-      <field name="requisition" value="guint16"/>
-      <field name="allocation" value="guint16"/>
-      <field name="spacing" value="guint16"/>
-      <field name="need_expand" value="guint"/>
-      <field name="need_shrink" value="guint"/>
-      <field name="expand" value="guint"/>
-      <field name="shrink" value="guint"/>
-      <field name="empty" value="guint"/>
+      <field name="requisition">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="allocation">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="spacing">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="need_expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="need_shrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="shrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="empty">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <class name="Table"
            c:type="GtkTable"
@@ -54460,11 +54928,21 @@
       </parameters>
     </function>
     <record name="GtkPixmap" c:type="GtkPixmap">
-      <field name="misc" value="GtkMisc"/>
-      <field name="pixmap" value="GdkPixmap*"/>
-      <field name="mask" value="GdkBitmap*"/>
-      <field name="pixmap_insensitive" value="GdkPixmap*"/>
-      <field name="build_insensitive" value="guint"/>
+      <field name="misc">
+        <type name="GtkMisc" c:type="GtkMisc"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="pixmap_insensitive">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="build_insensitive">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <function name="pixmap_get_type" c:identifier="gtk_pixmap_get_type">
       <return-value>
@@ -54531,10 +55009,18 @@
       </parameters>
     </function>
     <record name="GtkToolbarChild" c:type="GtkToolbarChild">
-      <field name="type" value="GtkToolbarChildType"/>
-      <field name="widget" value="GtkWidget*"/>
-      <field name="icon" value="GtkWidget*"/>
-      <field name="label" value="GtkWidget*"/>
+      <field name="type">
+        <type name="GtkToolbarChildType" c:type="GtkToolbarChildType"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="icon">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="label">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
     </record>
     <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
     <class name="Toolbar"
@@ -57244,54 +57730,150 @@
       </return-value>
     </function>
     <record name="GtkCList" c:type="GtkCList">
-      <field name="container" value="GtkContainer"/>
-      <field name="flags" value="guint16"/>
-      <field name="reserved1" value="gpointer"/>
-      <field name="reserved2" value="gpointer"/>
-      <field name="freeze_count" value="guint"/>
-      <field name="internal_allocation" value="GdkRectangle"/>
-      <field name="rows" value="gint"/>
-      <field name="row_height" value="gint"/>
-      <field name="row_list" value="GList*"/>
-      <field name="row_list_end" value="GList*"/>
-      <field name="columns" value="gint"/>
-      <field name="column_title_area" value="GdkRectangle"/>
-      <field name="title_window" value="GdkWindow*"/>
-      <field name="column" value="GtkCListColumn*"/>
-      <field name="clist_window" value="GdkWindow*"/>
-      <field name="clist_window_width" value="gint"/>
-      <field name="clist_window_height" value="gint"/>
-      <field name="hoffset" value="gint"/>
-      <field name="voffset" value="gint"/>
-      <field name="shadow_type" value="GtkShadowType"/>
-      <field name="selection_mode" value="GtkSelectionMode"/>
-      <field name="selection" value="GList*"/>
-      <field name="selection_end" value="GList*"/>
-      <field name="undo_selection" value="GList*"/>
-      <field name="undo_unselection" value="GList*"/>
-      <field name="undo_anchor" value="gint"/>
-      <field name="button_actions" value="guint8"/>
-      <field name="drag_button" value="guint8"/>
-      <field name="click_cell" value="GtkCListCellInfo"/>
-      <field name="hadjustment" value="GtkAdjustment*"/>
-      <field name="vadjustment" value="GtkAdjustment*"/>
-      <field name="xor_gc" value="GdkGC*"/>
-      <field name="fg_gc" value="GdkGC*"/>
-      <field name="bg_gc" value="GdkGC*"/>
-      <field name="cursor_drag" value="GdkCursor*"/>
-      <field name="x_drag" value="gint"/>
-      <field name="focus_row" value="gint"/>
-      <field name="focus_header_column" value="gint"/>
-      <field name="anchor" value="gint"/>
-      <field name="anchor_state" value="GtkStateType"/>
-      <field name="drag_pos" value="gint"/>
-      <field name="htimer" value="gint"/>
-      <field name="vtimer" value="gint"/>
-      <field name="sort_type" value="GtkSortType"/>
-      <field name="compare" value="GtkCListCompareFunc"/>
-      <field name="sort_column" value="gint"/>
-      <field name="drag_highlight_row" value="gint"/>
-      <field name="drag_highlight_pos" value="GtkCListDragPos"/>
+      <field name="container">
+        <type name="GtkContainer" c:type="GtkContainer"/>
+      </field>
+      <field name="flags">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="reserved1">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="reserved2">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="freeze_count">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="internal_allocation">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="rows">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="row_height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="row_list">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="row_list_end">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="columns">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="column_title_area">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="title_window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="column">
+        <type name="GtkCListColumn*" c:type="GtkCListColumn*"/>
+      </field>
+      <field name="clist_window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="clist_window_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="clist_window_height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="hoffset">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="voffset">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="shadow_type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </field>
+      <field name="selection_mode">
+        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
+      </field>
+      <field name="selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="selection_end">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_unselection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_anchor">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="button_actions">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="drag_button">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="click_cell">
+        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
+      </field>
+      <field name="hadjustment">
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+      </field>
+      <field name="vadjustment">
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+      </field>
+      <field name="xor_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="fg_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="bg_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="cursor_drag">
+        <type name="GdkCursor*" c:type="GdkCursor*"/>
+      </field>
+      <field name="x_drag">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="focus_row">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="focus_header_column">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="anchor">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="anchor_state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="drag_pos">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="htimer">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="vtimer">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="sort_type">
+        <type name="GtkSortType" c:type="GtkSortType"/>
+      </field>
+      <field name="compare">
+        <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
+      </field>
+      <field name="sort_column">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="drag_highlight_row">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="drag_highlight_pos">
+        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+      </field>
       <callback name="set_scroll_adjustments">
         <return-value>
           <type name="void" c:type="void"/>
@@ -57713,70 +58295,174 @@
       </callback>
     </record>
     <record name="GtkCListColumn" c:type="GtkCListColumn">
-      <field name="title" value="gchar*"/>
-      <field name="area" value="GdkRectangle"/>
-      <field name="button" value="GtkWidget*"/>
-      <field name="window" value="GdkWindow*"/>
-      <field name="width" value="gint"/>
-      <field name="min_width" value="gint"/>
-      <field name="max_width" value="gint"/>
-      <field name="justification" value="GtkJustification"/>
-      <field name="visible" value="guint"/>
-      <field name="width_set" value="guint"/>
-      <field name="resizeable" value="guint"/>
-      <field name="auto_resize" value="guint"/>
-      <field name="button_passive" value="guint"/>
+      <field name="title">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="area">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="min_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="max_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="justification">
+        <type name="GtkJustification" c:type="GtkJustification"/>
+      </field>
+      <field name="visible">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="width_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="resizeable">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="auto_resize">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="button_passive">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkCListRow" c:type="GtkCListRow">
-      <field name="cell" value="GtkCell*"/>
-      <field name="state" value="GtkStateType"/>
-      <field name="foreground" value="GdkColor"/>
-      <field name="background" value="GdkColor"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="data" value="gpointer"/>
-      <field name="destroy" value="GtkDestroyNotify"/>
-      <field name="fg_set" value="guint"/>
-      <field name="bg_set" value="guint"/>
-      <field name="selectable" value="guint"/>
+      <field name="cell">
+        <type name="GtkCell*" c:type="GtkCell*"/>
+      </field>
+      <field name="state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="foreground">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="background">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="data">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="destroy">
+        <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+      </field>
+      <field name="fg_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="bg_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selectable">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkCell" c:type="GtkCell">
-      <field name="type" value="GtkCellType"/>
-      <field name="vertical" value="gint16"/>
-      <field name="horizontal" value="gint16"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="u" value="???"/>
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="u">
+        <type name="???" c:type="???"/>
+      </field>
     </record>
     <record name="GtkCellText" c:type="GtkCellText">
-      <field name="type" value="GtkCellType"/>
-      <field name="vertical" value="gint16"/>
-      <field name="horizontal" value="gint16"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="text" value="gchar*"/>
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
     </record>
     <record name="GtkCellPixmap" c:type="GtkCellPixmap">
-      <field name="type" value="GtkCellType"/>
-      <field name="vertical" value="gint16"/>
-      <field name="horizontal" value="gint16"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="pixmap" value="GdkPixmap*"/>
-      <field name="mask" value="GdkBitmap*"/>
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
     </record>
     <record name="GtkCellPixText" c:type="GtkCellPixText">
-      <field name="type" value="GtkCellType"/>
-      <field name="vertical" value="gint16"/>
-      <field name="horizontal" value="gint16"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="text" value="gchar*"/>
-      <field name="spacing" value="guint8"/>
-      <field name="pixmap" value="GdkPixmap*"/>
-      <field name="mask" value="GdkBitmap*"/>
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="spacing">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
     </record>
     <record name="GtkCellWidget" c:type="GtkCellWidget">
-      <field name="type" value="GtkCellType"/>
-      <field name="vertical" value="gint16"/>
-      <field name="horizontal" value="gint16"/>
-      <field name="style" value="GtkStyle*"/>
-      <field name="widget" value="GtkWidget*"/>
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="gint16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
     </record>
     <callback name="GtkCListCompareFunc">
       <return-value>
@@ -57795,12 +58481,20 @@
       </parameters>
     </callback>
     <record name="GtkCListCellInfo" c:type="GtkCListCellInfo">
-      <field name="row" value="gint"/>
-      <field name="column" value="gint"/>
+      <field name="row">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="column">
+        <type name="gint" c:type="gint"/>
+      </field>
     </record>
     <record name="GtkCListDestInfo" c:type="GtkCListDestInfo">
-      <field name="cell" value="GtkCListCellInfo"/>
-      <field name="insert_pos" value="GtkCListDragPos"/>
+      <field name="cell">
+        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
+      </field>
+      <field name="insert_pos">
+        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+      </field>
     </record>
     <function name="clist_get_type" c:identifier="gtk_clist_get_type">
       <return-value>
@@ -59081,15 +59775,33 @@
       </return-value>
     </function>
     <record name="GtkCTree" c:type="GtkCTree">
-      <field name="clist" value="GtkCList"/>
-      <field name="lines_gc" value="GdkGC*"/>
-      <field name="tree_indent" value="gint"/>
-      <field name="tree_spacing" value="gint"/>
-      <field name="tree_column" value="gint"/>
-      <field name="line_style" value="guint"/>
-      <field name="expander_style" value="guint"/>
-      <field name="show_stub" value="guint"/>
-      <field name="drag_compare" value="GtkCTreeCompareDragFunc"/>
+      <field name="clist">
+        <type name="GtkCList" c:type="GtkCList"/>
+      </field>
+      <field name="lines_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="tree_indent">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="tree_spacing">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="tree_column">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="line_style">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expander_style">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="show_stub">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="drag_compare">
+        <type name="GtkCTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc"/>
+      </field>
       <callback name="tree_select_row">
         <return-value>
           <type name="void" c:type="void"/>
@@ -59182,20 +59894,44 @@
       </callback>
     </record>
     <record name="GtkCTreeRow" c:type="GtkCTreeRow">
-      <field name="row" value="GtkCListRow"/>
-      <field name="parent" value="GtkCTreeNode*"/>
-      <field name="sibling" value="GtkCTreeNode*"/>
-      <field name="children" value="GtkCTreeNode*"/>
-      <field name="pixmap_closed" value="GdkPixmap*"/>
-      <field name="mask_closed" value="GdkBitmap*"/>
-      <field name="pixmap_opened" value="GdkPixmap*"/>
-      <field name="mask_opened" value="GdkBitmap*"/>
-      <field name="level" value="guint16"/>
-      <field name="is_leaf" value="guint"/>
-      <field name="expanded" value="guint"/>
+      <field name="row">
+        <type name="GtkCListRow" c:type="GtkCListRow"/>
+      </field>
+      <field name="parent">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="sibling">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="children">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="pixmap_closed">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_closed">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="pixmap_opened">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_opened">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="level">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="is_leaf">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expanded">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkCTreeNode" c:type="GtkCTreeNode">
-      <field name="list" value="GList"/>
+      <field name="list">
+        <type name="GList" c:type="GList"/>
+      </field>
     </record>
     <callback name="GtkCTreeFunc">
       <return-value>
@@ -60619,16 +61355,32 @@
       </parameters>
     </callback>
     <record name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry">
-      <field name="path" value="gchar*"/>
-      <field name="accelerator" value="gchar*"/>
-      <field name="callback" value="GtkItemFactoryCallback"/>
-      <field name="callback_action" value="guint"/>
-      <field name="item_type" value="gchar*"/>
-      <field name="extra_data" value="gconstpointer"/>
+      <field name="path">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GtkItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
+      </field>
+      <field name="callback_action">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="item_type">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="extra_data">
+        <type name="gconstpointer" c:type="gconstpointer"/>
+      </field>
     </record>
     <record name="GtkItemFactoryItem" c:type="GtkItemFactoryItem">
-      <field name="path" value="gchar*"/>
-      <field name="widgets" value="GSList*"/>
+      <field name="path">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="widgets">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
     </record>
     <class name="ItemFactory"
            c:type="GtkItemFactory"
@@ -60930,7 +61682,9 @@
           </parameter>
         </parameters>
       </method>
-      <field name="item_ht" value="GHashTable*"/>
+      <field name="item_ht">
+        <type name="GHashTable*" c:type="GHashTable*"/>
+      </field>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="void" c:type="void"/>
@@ -61056,21 +61810,51 @@
       </parameters>
     </function>
     <record name="GtkList" c:type="GtkList">
-      <field name="container" value="GtkContainer"/>
-      <field name="children" value="GList*"/>
-      <field name="selection" value="GList*"/>
-      <field name="undo_selection" value="GList*"/>
-      <field name="undo_unselection" value="GList*"/>
-      <field name="last_focus_child" value="GtkWidget*"/>
-      <field name="undo_focus_child" value="GtkWidget*"/>
-      <field name="htimer" value="guint"/>
-      <field name="vtimer" value="guint"/>
-      <field name="anchor" value="gint"/>
-      <field name="drag_pos" value="gint"/>
-      <field name="anchor_state" value="GtkStateType"/>
-      <field name="selection_mode" value="guint"/>
-      <field name="drag_selection" value="guint"/>
-      <field name="add_mode" value="guint"/>
+      <field name="container">
+        <type name="GtkContainer" c:type="GtkContainer"/>
+      </field>
+      <field name="children">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_unselection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="last_focus_child">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="undo_focus_child">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="htimer">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="vtimer">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="anchor">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="drag_pos">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="anchor_state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="selection_mode">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="drag_selection">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="add_mode">
+        <type name="guint" c:type="guint"/>
+      </field>
       <callback name="selection_changed">
         <return-value>
           <type name="void" c:type="void"/>
@@ -61434,7 +62218,9 @@
       </parameters>
     </function>
     <record name="GtkListItem" c:type="GtkListItem">
-      <field name="item" value="GtkItem"/>
+      <field name="item">
+        <type name="GtkItem" c:type="GtkItem"/>
+      </field>
       <callback name="toggle_focus_row">
         <return-value>
           <type name="void" c:type="void"/>
@@ -61599,14 +62385,30 @@
       </parameters>
     </function>
     <record name="GtkOldEditable" c:type="GtkOldEditable">
-      <field name="widget" value="GtkWidget"/>
-      <field name="current_pos" value="guint"/>
-      <field name="selection_start_pos" value="guint"/>
-      <field name="selection_end_pos" value="guint"/>
-      <field name="has_selection" value="guint"/>
-      <field name="editable" value="guint"/>
-      <field name="visible" value="guint"/>
-      <field name="clipboard_text" value="gchar*"/>
+      <field name="widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </field>
+      <field name="current_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selection_start_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selection_end_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_selection">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="editable">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="visible">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="clipboard_text">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
       <callback name="activate">
         <return-value>
           <type name="void" c:type="void"/>
@@ -61985,20 +62787,44 @@
       </return-value>
     </function>
     <record name="GtkPreview" c:type="GtkPreview">
-      <field name="widget" value="GtkWidget"/>
-      <field name="buffer" value="guchar*"/>
-      <field name="buffer_width" value="guint16"/>
-      <field name="buffer_height" value="guint16"/>
-      <field name="bpp" value="guint16"/>
-      <field name="rowstride" value="guint16"/>
-      <field name="dither" value="GdkRgbDither"/>
-      <field name="type" value="guint"/>
-      <field name="expand" value="guint"/>
-      <field name="info" value="GtkPreviewInfo"/>
+      <field name="widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </field>
+      <field name="buffer">
+        <type name="guchar*" c:type="guchar*"/>
+      </field>
+      <field name="buffer_width">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="buffer_height">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="bpp">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="rowstride">
+        <type name="guint16" c:type="guint16"/>
+      </field>
+      <field name="dither">
+        <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+      </field>
+      <field name="type">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
+      </field>
     </record>
     <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
-      <field name="lookup" value="guchar*"/>
-      <field name="gamma" value="gdouble"/>
+      <field name="lookup">
+        <type name="guchar*" c:type="guchar*"/>
+      </field>
+      <field name="gamma">
+        <type name="gdouble" c:type="gdouble"/>
+      </field>
     </record>
     <function name="preview_get_type" c:identifier="gtk_preview_get_type">
       <return-value>
@@ -62191,14 +63017,30 @@
       </return-value>
     </function>
     <record name="GtkTipsQuery" c:type="GtkTipsQuery">
-      <field name="label" value="GtkLabel"/>
-      <field name="emit_always" value="guint"/>
-      <field name="in_query" value="guint"/>
-      <field name="label_inactive" value="gchar*"/>
-      <field name="label_no_tip" value="gchar*"/>
-      <field name="caller" value="GtkWidget*"/>
-      <field name="last_crossed" value="GtkWidget*"/>
-      <field name="query_cursor" value="GdkCursor*"/>
+      <field name="label">
+        <type name="GtkLabel" c:type="GtkLabel"/>
+      </field>
+      <field name="emit_always">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="in_query">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="label_inactive">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="label_no_tip">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="caller">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="last_crossed">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="query_cursor">
+        <type name="GdkCursor*" c:type="GdkCursor*"/>
+      </field>
       <callback name="start_query">
         <return-value>
           <type name="void" c:type="void"/>
@@ -62344,267 +63186,942 @@
         </parameter>
       </parameters>
     </function>
-    <function name="signal_newv" c:identifier="gtk_signal_newv">
+    <function name="marshal_BOOLEAN__VOID"
+              c:identifier="gtk_marshal_BOOLEAN__VOID">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="function_offset">
+        <parameter name="n_param_values">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
-        </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkType" c:type="GtkType*"/>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_new" c:identifier="gtk_signal_new">
+    <function name="marshal_BOOLEAN__POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="function_offset">
+        <parameter name="n_param_values">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
-        <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit_stop_by_name"
-              c:identifier="gtk_signal_emit_stop_by_name">
+    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_object_while_alive"
-              c:identifier="gtk_signal_connect_object_while_alive">
+    <function name="marshal_BOOLEAN__POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_while_alive"
-              c:identifier="gtk_signal_connect_while_alive">
+    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="func_data">
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_full" c:identifier="gtk_signal_connect_full">
+    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
       <return-value>
-        <type name="gulong" c:type="gulong"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="unsupported">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="invocation_hint">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
-        <parameter name="destroy_func">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-        <parameter name="object_signal">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="after">
-          <type name="gint" c:type="gint"/>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
+    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="signal_id">
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit" c:identifier="gtk_signal_emit">
+    <function name="marshal_INT__POINTER"
+              c:identifier="gtk_marshal_INT__POINTER">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="signal_id">
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
           <type name="guint" c:type="guint"/>
         </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="signal_emit_by_name" c:identifier="gtk_signal_emit_by_name">
+    <function name="marshal_INT__POINTER_CHAR_CHAR"
+              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emitv_by_name"
-              c:identifier="gtk_signal_emitv_by_name">
+    <function name="marshal_VOID__ENUM_FLOAT"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_compat_matched"
-              c:identifier="gtk_signal_compat_matched">
+    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="match">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="action">
-          <type name="guint" c:type="guint"/>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkCalendarPrivate" c:type="GtkCalendarPrivate"/>
-    <callback name="GtkCalendarDetailFunc">
+    <function name="marshal_VOID__INT_INT"
+              c:identifier="gtk_marshal_VOID__INT_INT">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="calendar">
-          <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="year">
-          <type name="guint" c:type="guint"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="month">
+        <parameter name="n_param_values">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="day">
-          <type name="guint" c:type="guint"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="user_data">
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="Calendar"
-           c:type="GtkCalendar"
-           parent="Widget"
-           glib:type-name="GtkCalendar"
-           glib:get-type="gtk_calendar_get_type">
-      <method name="select_month" c:identifier="gtk_calendar_select_month">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
+    </function>
+    <function name="marshal_VOID__INT_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_INT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_STRING_STRING"
+              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__STRING_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_STRING"
+              c:identifier="gtk_marshal_VOID__UINT_STRING">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_newv" c:identifier="gtk_signal_newv">
+      <return-value>
+        <type name="guint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="function_offset">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="marshaller">
+          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="args">
+          <type name="GtkType" c:type="GtkType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_new" c:identifier="gtk_signal_new">
+      <return-value>
+        <type name="guint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="function_offset">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="marshaller">
+          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit_stop_by_name"
+              c:identifier="gtk_signal_emit_stop_by_name">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_object_while_alive"
+              c:identifier="gtk_signal_connect_object_while_alive">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_while_alive"
+              c:identifier="gtk_signal_connect_while_alive">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_full" c:identifier="gtk_signal_connect_full">
+      <return-value>
+        <type name="gulong" c:type="gulong"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="unsupported">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy_func">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+        <parameter name="object_signal">
+          <type name="gint" c:type="gint"/>
+        </parameter>
+        <parameter name="after">
+          <type name="gint" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="args">
+          <type name="GtkArg" c:type="GtkArg*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit" c:identifier="gtk_signal_emit">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit_by_name" c:identifier="gtk_signal_emit_by_name">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emitv_by_name"
+              c:identifier="gtk_signal_emitv_by_name">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="gchar" c:type="gchar*"/>
+        </parameter>
+        <parameter name="args">
+          <type name="GtkArg" c:type="GtkArg*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_compat_matched"
+              c:identifier="gtk_signal_compat_matched">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+        <parameter name="match">
+          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
+        </parameter>
+        <parameter name="action">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkCalendarPrivate" c:type="GtkCalendarPrivate"/>
+    <callback name="GtkCalendarDetailFunc">
+      <return-value>
+        <type name="gchar*" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="calendar">
+          <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+        </parameter>
+        <parameter name="year">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="month">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="day">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="Calendar"
+           c:type="GtkCalendar"
+           parent="Widget"
+           glib:type-name="GtkCalendar"
+           glib:get-type="gtk_calendar_get_type">
+      <method name="select_month" c:identifier="gtk_calendar_select_month">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
         <parameters>
           <parameter name="calendar">
             <type name="Calendar" c:type="GtkCalendar*"/>
@@ -63061,2058 +64578,1393 @@
       <method name="set_display_name"
               c:identifier="gtk_file_info_set_display_name">
         <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="display_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_is_folder" c:identifier="gtk_file_info_get_is_folder">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_is_folder" c:identifier="gtk_file_info_set_is_folder">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="is_folder">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_is_hidden" c:identifier="gtk_file_info_get_is_hidden">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_is_hidden" c:identifier="gtk_file_info_set_is_hidden">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="is_hidden">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_mime_type" c:identifier="gtk_file_info_get_mime_type">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_mime_type" c:identifier="gtk_file_info_set_mime_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_modification_time"
-              c:identifier="gtk_file_info_get_modification_time">
-        <return-value>
-          <type name="GtkFileTime" c:type="GtkFileTime"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_modification_time"
-              c:identifier="gtk_file_info_set_modification_time">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="modification_time">
-            <type name="GtkFileTime" c:type="GtkFileTime"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_file_info_get_size">
-        <return-value>
-          <type name="gint64" c:type="gint64"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_size" c:identifier="gtk_file_info_set_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint64" c:type="gint64"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_name" c:identifier="gtk_file_info_set_icon_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="con_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_name" c:identifier="gtk_file_info_get_icon_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="render_icon" c:identifier="gtk_file_info_render_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="pixel_size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <class name="FileSystemHandle"
-           c:type="GtkFileSystemHandle"
-           parent="GLib.Object"
-           glib:type-name="GtkFileSystemHandle"
-           glib:get-type="gtk_file_system_handle_get_type">
-      <property name="cancelled">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <callback name="GtkFileSystemGetInfoCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="file_info">
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemGetFolderCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemCreateFolderCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemVolumeMountCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="FileSystem"
-               c:type="GtkFileSystem"
-               glib:type-name="GtkFileSystem"
-               glib:get-type="gtk_file_system_get_type">
-      <callback name="list_volumes">
-        <return-value>
-          <type name="GSList*" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_volume_for_path">
-        <return-value>
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_folder">
-        <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemGetFolderCallback"
-                    c:type="GtkFileSystemGetFolderCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_info">
-        <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemGetInfoCallback"
-                    c:type="GtkFileSystemGetInfoCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="create_folder">
-        <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemCreateFolderCallback"
-                    c:type="GtkFileSystemCreateFolderCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cancel_operation">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle">
-            <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_free">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_get_base_path">
-        <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_get_is_mounted">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_mount">
-        <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemVolumeMountCallback"
-                    c:type="GtkFileSystemVolumeMountCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_get_display_name">
-        <return-value>
-          <type name="char*" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_get_icon_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_parent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="make_path">
-        <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="display_name">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="parse">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="folder">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
-          </parameter>
-          <parameter name="file_part">
-            <type name="gchar**" c:type="gchar**"/>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="display_name">
+            <type name="gchar" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="path_to_uri">
+      </method>
+      <method name="get_is_folder" c:identifier="gtk_file_info_get_is_folder">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="path_to_filename">
+      </method>
+      <method name="set_is_folder" c:identifier="gtk_file_info_set_is_folder">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="is_folder">
+            <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="uri_to_path">
+      </method>
+      <method name="get_is_hidden" c:identifier="gtk_file_info_get_is_hidden">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="filename_to_path">
+      </method>
+      <method name="set_is_hidden" c:identifier="gtk_file_info_set_is_hidden">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="is_hidden">
+            <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_bookmark">
+      </method>
+      <method name="get_mime_type" c:identifier="gtk_file_info_get_mime_type">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="gchar" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_bookmark">
+      </method>
+      <method name="set_mime_type" c:identifier="gtk_file_info_set_mime_type">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="mime_type">
+            <type name="gchar" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="list_bookmarks">
+      </method>
+      <method name="get_modification_time"
+              c:identifier="gtk_file_info_get_modification_time">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="GtkFileTime" c:type="GtkFileTime"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volumes_changed">
+      </method>
+      <method name="set_modification_time"
+              c:identifier="gtk_file_info_set_modification_time">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+          <parameter name="modification_time">
+            <type name="GtkFileTime" c:type="GtkFileTime"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="bookmarks_changed">
+      </method>
+      <method name="get_size" c:identifier="gtk_file_info_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gint64" c:type="gint64"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_bookmark_label">
+      </method>
+      <method name="set_size" c:identifier="gtk_file_info_set_size">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="size">
+            <type name="gint64" c:type="gint64"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_bookmark_label">
+      </method>
+      <method name="set_icon_name" c:identifier="gtk_file_info_set_icon_name">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="label">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="con_name">
+            <type name="gchar" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="volumes-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="bookmarks-changed">
+      </method>
+      <method name="get_icon_name" c:identifier="gtk_file_info_get_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="file_system_list_volumes"
-              c:identifier="gtk_file_system_list_volumes">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_volume_for_path"
-              c:identifier="gtk_file_system_get_volume_for_path">
-      <return-value>
-        <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_free"
-              c:identifier="gtk_file_system_volume_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_base_path"
-              c:identifier="gtk_file_system_volume_get_base_path">
-      <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_is_mounted"
-              c:identifier="gtk_file_system_volume_get_is_mounted">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_mount"
-              c:identifier="gtk_file_system_volume_mount">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemVolumeMountCallback"
-                  c:type="GtkFileSystemVolumeMountCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_display_name"
-              c:identifier="gtk_file_system_volume_get_display_name">
-      <return-value>
-        <type name="char*" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_render_icon"
-              c:identifier="gtk_file_system_volume_render_icon">
-      <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="pixel_size">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_icon_name"
-              c:identifier="gtk_file_system_volume_get_icon_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_parent"
-              c:identifier="gtk_file_system_get_parent">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_folder"
-              c:identifier="gtk_file_system_get_folder">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetFolderCallback"
-                  c:type="GtkFileSystemGetFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_info"
-              c:identifier="gtk_file_system_get_info">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetInfoCallback"
-                  c:type="GtkFileSystemGetInfoCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_create_folder"
-              c:identifier="gtk_file_system_create_folder">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemCreateFolderCallback"
-                  c:type="GtkFileSystemCreateFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_cancel_operation"
-              c:identifier="gtk_file_system_cancel_operation">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_make_path"
-              c:identifier="gtk_file_system_make_path">
-      <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="display_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_parse" c:identifier="gtk_file_system_parse">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="str">
           <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
-        </parameter>
-        <parameter name="file_part">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_to_uri"
-              c:identifier="gtk_file_system_path_to_uri">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_to_filename"
-              c:identifier="gtk_file_system_path_to_filename">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_uri_to_path"
-              c:identifier="gtk_file_system_uri_to_path">
-      <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_filename_to_path"
-              c:identifier="gtk_file_system_filename_to_path">
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="render_icon" c:identifier="gtk_file_info_render_icon">
+        <return-value>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="pixel_size">
+            <type name="gint" c:type="gint"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <class name="FileSystemHandle"
+           c:type="GtkFileSystemHandle"
+           parent="GLib.Object"
+           glib:type-name="GtkFileSystemHandle"
+           glib:get-type="gtk_file_system_handle_get_type">
+      <property name="cancelled">
+        <type name="gboolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <callback name="GtkFileSystemGetInfoCallback">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </parameter>
-        <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="file_info">
+          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_is_local"
-              c:identifier="gtk_file_system_path_is_local">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filesystem">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_system_insert_bookmark"
-              c:identifier="gtk_file_system_insert_bookmark">
+    </callback>
+    <callback name="GtkFileSystemGetFolderCallback">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
+        <parameter name="folder">
+          <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_system_remove_bookmark"
-              c:identifier="gtk_file_system_remove_bookmark">
+    </callback>
+    <callback name="GtkFileSystemCreateFolderCallback">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_list_bookmarks"
-              c:identifier="gtk_file_system_list_bookmarks">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_bookmark_label"
-              c:identifier="gtk_file_system_get_bookmark_label">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <type name="GError*" c:type="GError*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_system_set_bookmark_label"
-              c:identifier="gtk_file_system_set_bookmark_label">
+    </callback>
+    <callback name="GtkFileSystemVolumeMountCallback">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <interface name="FileFolder"
-               c:type="GtkFileFolder"
-               glib:type-name="GtkFileFolder"
-               glib:get-type="gtk_file_folder_get_type">
+    </callback>
+    <interface name="FileSystem"
+               c:type="GtkFileSystem"
+               glib:type-name="GtkFileSystem"
+               glib:get-type="gtk_file_system_get_type">
+      <callback name="list_volumes">
+        <return-value>
+          <type name="GSList*" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_volume_for_path">
+        <return-value>
+          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_folder">
+        <return-value>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemGetFolderCallback"
+                    c:type="GtkFileSystemGetFolderCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
       <callback name="get_info">
         <return-value>
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemGetInfoCallback"
+                    c:type="GtkFileSystemGetInfoCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_folder">
+        <return-value>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemCreateFolderCallback"
+                    c:type="GtkFileSystemCreateFolderCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel_operation">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="handle">
+            <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_free">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_get_base_path">
+        <return-value>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_get_is_mounted">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_mount">
+        <return-value>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemVolumeMountCallback"
+                    c:type="GtkFileSystemVolumeMountCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_get_display_name">
+        <return-value>
+          <type name="char*" c:type="char*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volume_get_icon_name">
+        <return-value>
+          <type name="gchar*" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_parent">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
             <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
+          <parameter name="parent">
+            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+          </parameter>
           <parameter name="error">
             <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="list_children">
+      <callback name="make_path">
+        <return-value>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="base_path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="gchar*" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="parse">
         <return-value>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="base_path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="gchar*" c:type="gchar*"/>
+          </parameter>
           <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
           </parameter>
-          <parameter name="children">
-            <type name="GSList**" c:type="GSList**"/>
+          <parameter name="file_part">
+            <type name="gchar**" c:type="gchar**"/>
           </parameter>
           <parameter name="error">
             <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="deleted">
+      <callback name="path_to_uri">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gchar*" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_added">
+      <callback name="path_to_filename">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gchar*" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_changed">
+      <callback name="uri_to_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="uri">
+            <type name="gchar*" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_removed">
+      <callback name="filename_to_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="path">
+            <type name="gchar*" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_finished_loading">
+      <callback name="insert_bookmark">
         <return-value>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="gint" c:type="gint"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="finished_loading">
+      <callback name="remove_bookmark">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="deleted">
+      <callback name="list_bookmarks">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="files-added">
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="volumes_changed">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="files-changed">
+      </callback>
+      <callback name="bookmarks_changed">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="files-removed">
+      </callback>
+      <callback name="get_bookmark_label">
+        <return-value>
+          <type name="gchar*" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_bookmark_label">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="gchar*" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="volumes-changed">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="finished-loading">
+      <glib:signal name="bookmarks-changed">
         <return-value>
           <type name="void" c:type="void"/>
         </return-value>
       </glib:signal>
     </interface>
-    <function name="file_folder_list_children"
-              c:identifier="gtk_file_folder_list_children">
+    <function name="file_system_list_volumes"
+              c:identifier="gtk_file_system_list_volumes">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="children">
-          <type name="GSList" c:type="GSList**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_folder_get_info"
-              c:identifier="gtk_file_folder_get_info">
+    <function name="file_system_get_volume_for_path"
+              c:identifier="gtk_file_system_get_volume_for_path">
       <return-value>
-        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+        <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
       </return-value>
       <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
           <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="file_folder_is_finished_loading"
-              c:identifier="gtk_file_folder_is_finished_loading">
+    <function name="file_system_volume_free"
+              c:identifier="gtk_file_system_volume_free">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="FilePath"
-                glib:name="FilePath"
-                glib:type-name="GtkFilePath"
-                glib:get-type="gtk_file_path_get_type">
-    </glib:boxed>
-    <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
+    <function name="file_system_volume_get_base_path"
+              c:identifier="gtk_file_system_volume_get_base_path">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_paths_free" c:identifier="gtk_file_paths_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_create" c:identifier="gtk_file_system_create">
+    <function name="file_system_volume_get_is_mounted"
+              c:identifier="gtk_file_system_volume_get_is_mounted">
       <return-value>
-        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system_name">
-          <type name="char" c:type="char*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
-      <field name="context_id" value="gchar*"/>
-      <field name="context_name" value="gchar*"/>
-      <field name="domain" value="gchar*"/>
-      <field name="domain_dirname" value="gchar*"/>
-      <field name="default_locales" value="gchar*"/>
-    </record>
-    <function name="im_module_list" c:identifier="_gtk_im_module_list">
+    <function name="file_system_volume_mount"
+              c:identifier="gtk_file_system_volume_mount">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
-        <parameter name="contexts">
-          <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="n_contexts">
-          <type name="guint" c:type="guint*"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="im_module_create" c:identifier="_gtk_im_module_create">
-      <return-value>
-        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="callback">
+          <type name="GtkFileSystemVolumeMountCallback"
+                  c:type="GtkFileSystemVolumeMountCallback"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="im_module_get_default_context_id"
-              c:identifier="_gtk_im_module_get_default_context_id">
+    <function name="file_system_volume_get_display_name"
+              c:identifier="gtk_file_system_volume_get_display_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="char*" c:type="char*"/>
       </return-value>
       <parameters>
-        <parameter name="client_window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__VOID"
-              c:identifier="gtk_marshal_BOOLEAN__VOID">
+    <function name="file_system_volume_render_icon"
+              c:identifier="gtk_file_system_volume_render_icon">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="pixel_size">
+          <type name="gint" c:type="gint"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER">
+    <function name="file_system_volume_get_icon_name"
+              c:identifier="gtk_file_system_volume_get_icon_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar*" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
+    <function name="file_system_get_parent"
+              c:identifier="gtk_file_system_get_parent">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="parent">
+          <type name="GtkFilePath" c:type="GtkFilePath**"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
+    <function name="file_system_get_folder"
+              c:identifier="gtk_file_system_get_folder">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="types">
+          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="callback">
+          <type name="GtkFileSystemGetFolderCallback"
+                  c:type="GtkFileSystemGetFolderCallback"/>
         </parameter>
-        <parameter name="marshal_data">
+        <parameter name="data">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
+    <function name="file_system_get_info"
+              c:identifier="gtk_file_system_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="types">
+          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="callback">
+          <type name="GtkFileSystemGetInfoCallback"
+                  c:type="GtkFileSystemGetInfoCallback"/>
         </parameter>
-        <parameter name="marshal_data">
+        <parameter name="data">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
+    <function name="file_system_create_folder"
+              c:identifier="gtk_file_system_create_folder">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="callback">
+          <type name="GtkFileSystemCreateFolderCallback"
+                  c:type="GtkFileSystemCreateFolderCallback"/>
         </parameter>
-        <parameter name="marshal_data">
+        <parameter name="data">
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
+    <function name="file_system_cancel_operation"
+              c:identifier="gtk_file_system_cancel_operation">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="handle">
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_INT__POINTER"
-              c:identifier="gtk_marshal_INT__POINTER">
+    <function name="file_system_make_path"
+              c:identifier="gtk_file_system_make_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="base_path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="display_name">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_INT__POINTER_CHAR_CHAR"
-              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
+    <function name="file_system_parse" c:identifier="gtk_file_system_parse">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="base_path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="str">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="folder">
+          <type name="GtkFilePath" c:type="GtkFilePath**"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_part">
+          <type name="gchar" c:type="gchar**"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__ENUM_FLOAT"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
+    <function name="file_system_path_to_uri"
+              c:identifier="gtk_file_system_path_to_uri">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar*" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
+    <function name="file_system_path_to_filename"
+              c:identifier="gtk_file_system_path_to_filename">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar*" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__INT_INT"
-              c:identifier="gtk_marshal_VOID__INT_INT">
+    <function name="file_system_uri_to_path"
+              c:identifier="gtk_file_system_uri_to_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="uri">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__INT_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
+    <function name="file_system_filename_to_path"
+              c:identifier="gtk_file_system_filename_to_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="filename">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_INT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT">
+    <function name="file_system_path_is_local"
+              c:identifier="gtk_file_system_path_is_local">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="filesystem">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
+    <function name="file_system_insert_bookmark"
+              c:identifier="gtk_file_system_insert_bookmark">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="position">
+          <type name="gint" c:type="gint"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
+    <function name="file_system_remove_bookmark"
+              c:identifier="gtk_file_system_remove_bookmark">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_STRING_STRING"
-              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
+    <function name="file_system_list_bookmarks"
+              c:identifier="gtk_file_system_list_bookmarks">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT">
+    <function name="file_system_get_bookmark_label"
+              c:identifier="gtk_file_system_get_bookmark_label">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar*" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
+    <function name="file_system_set_bookmark_label"
+              c:identifier="gtk_file_system_set_bookmark_label">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="label">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
+    <interface name="FileFolder"
+               c:type="GtkFileFolder"
+               glib:type-name="GtkFileFolder"
+               glib:get-type="gtk_file_folder_get_type">
+      <callback name="get_info">
+        <return-value>
+          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="list_children">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="children">
+            <type name="GSList**" c:type="GSList**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="deleted">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="files_added">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="files_changed">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="files_removed">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_finished_loading">
+        <return-value>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="finished_loading">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="deleted">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="files-added">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="files-changed">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="files-removed">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="finished-loading">
+        <return-value>
+          <type name="void" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="file_folder_list_children"
+              c:identifier="gtk_file_folder_list_children">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="children">
+          <type name="GSList" c:type="GSList**"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
+    <function name="file_folder_get_info"
+              c:identifier="gtk_file_folder_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
+    <function name="file_folder_is_finished_loading"
+              c:identifier="gtk_file_folder_is_finished_loading">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__STRING_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
+    <glib:boxed c:type="FilePath"
+                glib:name="FilePath"
+                glib:type-name="GtkFilePath"
+                glib:get-type="gtk_file_path_get_type">
+    </glib:boxed>
+    <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
+    <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
+    <function name="file_paths_free" c:identifier="gtk_file_paths_free">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="file_system_create" c:identifier="gtk_file_system_create">
+      <return-value>
+        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system_name">
+          <type name="char" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__UINT_STRING"
-              c:identifier="gtk_marshal_VOID__UINT_STRING">
+    <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
+      <field name="context_id">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="context_name">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="domain">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="domain_dirname">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+      <field name="default_locales">
+        <type name="gchar*" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="im_module_list" c:identifier="_gtk_im_module_list">
       <return-value>
         <type name="void" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="contexts">
+          <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="n_contexts">
+          <type name="guint" c:type="guint*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="im_module_create" c:identifier="_gtk_im_module_create">
+      <return-value>
+        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+      </return-value>
+      <parameters>
+        <parameter name="context_id">
+          <type name="gchar" c:type="gchar*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="im_module_get_default_context_id"
+              c:identifier="_gtk_im_module_get_default_context_id">
+      <return-value>
+        <type name="gchar*" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="client_window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
       </parameters>
     </function>
@@ -65135,37 +65987,91 @@
     <record name="GtkTextLine" c:type="GtkTextLine"/>
     <record name="GtkTextLineData" c:type="GtkTextLineData"/>
     <record name="GtkTextLineDisplay" c:type="GtkTextLineDisplay">
-      <field name="layout" value="PangoLayout*"/>
-      <field name="cursors" value="GSList*"/>
-      <field name="shaped_objects" value="GSList*"/>
-      <field name="direction" value="GtkTextDirection"/>
-      <field name="width" value="gint"/>
-      <field name="total_width" value="gint"/>
-      <field name="height" value="gint"/>
-      <field name="x_offset" value="gint"/>
-      <field name="left_margin" value="gint"/>
-      <field name="right_margin" value="gint"/>
-      <field name="top_margin" value="gint"/>
-      <field name="bottom_margin" value="gint"/>
-      <field name="insert_index" value="gint"/>
-      <field name="size_only" value="gboolean"/>
-      <field name="line" value="GtkTextLine*"/>
-      <field name="pg_bg_color" value="GdkColor*"/>
-      <field name="block_cursor" value="GdkRectangle"/>
-      <field name="cursors_invalid" value="guint"/>
-      <field name="has_block_cursor" value="guint"/>
-      <field name="cursor_at_line_end" value="guint"/>
+      <field name="layout">
+        <type name="PangoLayout*" c:type="PangoLayout*"/>
+      </field>
+      <field name="cursors">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="shaped_objects">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="direction">
+        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+      </field>
+      <field name="width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="total_width">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="x_offset">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="left_margin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="right_margin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="top_margin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="bottom_margin">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="insert_index">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="size_only">
+        <type name="gboolean" c:type="gboolean"/>
+      </field>
+      <field name="line">
+        <type name="GtkTextLine*" c:type="GtkTextLine*"/>
+      </field>
+      <field name="pg_bg_color">
+        <type name="GdkColor*" c:type="GdkColor*"/>
+      </field>
+      <field name="block_cursor">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="cursors_invalid">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_block_cursor">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="cursor_at_line_end">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkTextCursorDisplay" c:type="GtkTextCursorDisplay">
-      <field name="x" value="gint"/>
-      <field name="y" value="gint"/>
-      <field name="height" value="gint"/>
-      <field name="is_strong" value="guint"/>
-      <field name="is_weak" value="guint"/>
+      <field name="x">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="gint" c:type="gint"/>
+      </field>
+      <field name="is_strong">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_weak">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="GtkTextAttrAppearance" c:type="GtkTextAttrAppearance">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="appearance" value="GtkTextAppearance"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="appearance">
+        <type name="GtkTextAppearance" c:type="GtkTextAppearance"/>
+      </field>
     </record>
     <class name="TextLayout"
            c:type="GtkTextLayout"
diff --git a/gir-repository/gir/pango-1.0.gir b/gir-repository/gir/pango-1.0.gir
index 6cc842d..52bcff8 100644
--- a/gir-repository/gir/pango-1.0.gir
+++ b/gir-repository/gir/pango-1.0.gir
@@ -133,27 +133,61 @@
       </parameters>
     </function>
     <record name="PangoLogAttr" c:type="PangoLogAttr">
-      <field name="is_line_break" value="guint"/>
-      <field name="is_mandatory_break" value="guint"/>
-      <field name="is_char_break" value="guint"/>
-      <field name="is_white" value="guint"/>
-      <field name="is_cursor_position" value="guint"/>
-      <field name="is_word_start" value="guint"/>
-      <field name="is_word_end" value="guint"/>
-      <field name="is_sentence_boundary" value="guint"/>
-      <field name="is_sentence_start" value="guint"/>
-      <field name="is_sentence_end" value="guint"/>
-      <field name="backspace_deletes_character" value="guint"/>
-      <field name="is_expandable_space" value="guint"/>
-      <field name="is_word_boundary" value="guint"/>
+      <field name="is_line_break">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_mandatory_break">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_char_break">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_white">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_cursor_position">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_word_start">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_word_end">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_sentence_boundary">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_sentence_start">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_sentence_end">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="backspace_deletes_character">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_expandable_space">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_word_boundary">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="PangoEngineLang" c:type="PangoEngineLang"/>
     <record name="PangoEngineShape" c:type="PangoEngineShape"/>
     <record name="PangoRectangle" c:type="PangoRectangle">
-      <field name="x" value="int"/>
-      <field name="y" value="int"/>
-      <field name="width" value="int"/>
-      <field name="height" value="int"/>
+      <field name="x">
+        <type name="int" c:type="int"/>
+      </field>
+      <field name="y">
+        <type name="int" c:type="int"/>
+      </field>
+      <field name="width">
+        <type name="int" c:type="int"/>
+      </field>
+      <field name="height">
+        <type name="int" c:type="int"/>
+      </field>
     </record>
     <function name="units_from_double" c:identifier="pango_units_from_double">
       <return-value>
@@ -1942,46 +1976,94 @@
       </method>
     </glib:boxed>
     <record name="PangoAttribute" c:type="PangoAttribute">
-      <field name="klass" value="PangoAttrClass*"/>
-      <field name="start_index" value="guint"/>
-      <field name="end_index" value="guint"/>
+      <field name="klass">
+        <type name="PangoAttrClass*" c:type="PangoAttrClass*"/>
+      </field>
+      <field name="start_index">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="end_index">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="PangoAttrString" c:type="PangoAttrString">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="value" value="char*"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="value">
+        <type name="char*" c:type="char*"/>
+      </field>
     </record>
     <record name="PangoAttrLanguage" c:type="PangoAttrLanguage">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="value" value="PangoLanguage*"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="value">
+        <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+      </field>
     </record>
     <record name="PangoAttrInt" c:type="PangoAttrInt">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="value" value="int"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="value">
+        <type name="int" c:type="int"/>
+      </field>
     </record>
     <record name="PangoAttrSize" c:type="PangoAttrSize">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="size" value="int"/>
-      <field name="absolute" value="guint"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="size">
+        <type name="int" c:type="int"/>
+      </field>
+      <field name="absolute">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="PangoAttrFloat" c:type="PangoAttrFloat">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="value" value="double"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="value">
+        <type name="double" c:type="double"/>
+      </field>
     </record>
     <record name="PangoAttrColor" c:type="PangoAttrColor">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="color" value="PangoColor"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="color">
+        <type name="PangoColor" c:type="PangoColor"/>
+      </field>
     </record>
     <record name="PangoAttrFontDesc" c:type="PangoAttrFontDesc">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="desc" value="PangoFontDescription*"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="desc">
+        <type name="PangoFontDescription*" c:type="PangoFontDescription*"/>
+      </field>
     </record>
     <record name="PangoAttrShape" c:type="PangoAttrShape">
-      <field name="attr" value="PangoAttribute"/>
-      <field name="ink_rect" value="PangoRectangle"/>
-      <field name="logical_rect" value="PangoRectangle"/>
-      <field name="data" value="gpointer"/>
-      <field name="copy_func" value="PangoAttrDataCopyFunc"/>
-      <field name="destroy_func" value="GDestroyNotify"/>
+      <field name="attr">
+        <type name="PangoAttribute" c:type="PangoAttribute"/>
+      </field>
+      <field name="ink_rect">
+        <type name="PangoRectangle" c:type="PangoRectangle"/>
+      </field>
+      <field name="logical_rect">
+        <type name="PangoRectangle" c:type="PangoRectangle"/>
+      </field>
+      <field name="data">
+        <type name="gpointer" c:type="gpointer"/>
+      </field>
+      <field name="copy_func">
+        <type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
+      </field>
+      <field name="destroy_func">
+        <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+      </field>
     </record>
     <record name="PangoAttrIterator" c:type="PangoAttrIterator"/>
     <enumeration name="AttrType"
@@ -2718,15 +2800,33 @@
       </parameters>
     </function>
     <record name="PangoAnalysis" c:type="PangoAnalysis">
-      <field name="shape_engine" value="PangoEngineShape*"/>
-      <field name="lang_engine" value="PangoEngineLang*"/>
-      <field name="font" value="PangoFont*"/>
-      <field name="level" value="guint8"/>
-      <field name="gravity" value="guint8"/>
-      <field name="flags" value="guint8"/>
-      <field name="script" value="guint8"/>
-      <field name="language" value="PangoLanguage*"/>
-      <field name="extra_attrs" value="GSList*"/>
+      <field name="shape_engine">
+        <type name="PangoEngineShape*" c:type="PangoEngineShape*"/>
+      </field>
+      <field name="lang_engine">
+        <type name="PangoEngineLang*" c:type="PangoEngineLang*"/>
+      </field>
+      <field name="font">
+        <type name="PangoFont*" c:type="PangoFont*"/>
+      </field>
+      <field name="level">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="gravity">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="flags">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="script">
+        <type name="guint8" c:type="guint8"/>
+      </field>
+      <field name="language">
+        <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+      </field>
+      <field name="extra_attrs">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
     </record>
     <glib:boxed c:type="Item"
                 glib:name="Item"
@@ -3231,17 +3331,31 @@
       </parameters>
     </function>
     <record name="PangoGlyphGeometry" c:type="PangoGlyphGeometry">
-      <field name="width" value="PangoGlyphUnit"/>
-      <field name="x_offset" value="PangoGlyphUnit"/>
-      <field name="y_offset" value="PangoGlyphUnit"/>
+      <field name="width">
+        <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+      </field>
+      <field name="x_offset">
+        <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+      </field>
+      <field name="y_offset">
+        <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+      </field>
     </record>
     <record name="PangoGlyphVisAttr" c:type="PangoGlyphVisAttr">
-      <field name="is_cluster_start" value="guint"/>
+      <field name="is_cluster_start">
+        <type name="guint" c:type="guint"/>
+      </field>
     </record>
     <record name="PangoGlyphInfo" c:type="PangoGlyphInfo">
-      <field name="glyph" value="PangoGlyph"/>
-      <field name="geometry" value="PangoGlyphGeometry"/>
-      <field name="attr" value="PangoGlyphVisAttr"/>
+      <field name="glyph">
+        <type name="PangoGlyph" c:type="PangoGlyph"/>
+      </field>
+      <field name="geometry">
+        <type name="PangoGlyphGeometry" c:type="PangoGlyphGeometry"/>
+      </field>
+      <field name="attr">
+        <type name="PangoGlyphVisAttr" c:type="PangoGlyphVisAttr"/>
+      </field>
     </record>
     <function name="glyph_string_new" c:identifier="pango_glyph_string_new">
       <return-value>
@@ -5604,6 +5718,17 @@
         <type name="PangoFontMap*" c:type="PangoFontMap*"/>
       </return-value>
     </function>
+    <function name="cairo_font_map_set_default"
+              c:identifier="pango_cairo_font_map_set_default">
+      <return-value>
+        <type name="void" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="fontmap">
+          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="cairo_font_map_get_font_type"
               c:identifier="pango_cairo_font_map_get_font_type">
       <return-value>
@@ -5768,6 +5893,17 @@
         </parameter>
       </parameters>
     </function>
+    <function name="cairo_create_context"
+              c:identifier="pango_cairo_create_context">
+      <return-value>
+        <type name="PangoContext*" c:type="PangoContext*"/>
+      </return-value>
+      <parameters>
+        <parameter name="cr">
+          <type name="cairo_t" c:type="cairo_t*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="cairo_create_layout"
               c:identifier="pango_cairo_create_layout">
       <return-value>
@@ -5955,7 +6091,9 @@
       </parameters>
     </function>
     <record name="PangoFcDecoder" c:type="PangoFcDecoder">
-      <field name="parent_instance" value="GObject"/>
+      <field name="parent_instance">
+        <type name="GObject" c:type="GObject"/>
+      </field>
       <callback name="get_charset">
         <return-value>
           <type name="FcCharSet*" c:type="FcCharSet*"/>
@@ -6387,11 +6525,22 @@
       </parameters>
     </function>
     <record name="PangoXftRenderer" c:type="PangoXftRenderer">
-      <field name="parent_instance" value="PangoRenderer"/>
-      <field name="display" value="Display*"/>
-      <field name="screen" value="int"/>
-      <field name="draw" value="XftDraw*"/>
-      <field name="priv" value="PangoXftRendererPrivate*"/>
+      <field name="parent_instance">
+        <type name="PangoRenderer" c:type="PangoRenderer"/>
+      </field>
+      <field name="display">
+        <type name="Display*" c:type="Display*"/>
+      </field>
+      <field name="screen">
+        <type name="int" c:type="int"/>
+      </field>
+      <field name="draw">
+        <type name="XftDraw*" c:type="XftDraw*"/>
+      </field>
+      <field name="priv">
+        <type name="PangoXftRendererPrivate*"
+                c:type="PangoXftRendererPrivate*"/>
+      </field>
       <callback name="composite_trapezoids">
         <return-value>
           <type name="void" c:type="void"/>
diff --git a/gir-tester.lisp b/gir-tester.lisp
index 60ed19f..d194c5e 100644
--- a/gir-tester.lisp
+++ b/gir-tester.lisp
@@ -9,5 +9,10 @@
   (mapcar 
    #'(lambda (gir)
        (parse-repository gir *gir-top-level-function-elements*))
-   *gir-files*))
+   *gir-files*)
+  (format t ";; the following types need to be defined in order to use this binding~%"
+  (iterate
+	(for unknown in *unknown-types*)
+	(format t ";; ~T~A~%" unknown))
+  (format t ";; thank you for your attention!~%")))
 
-- 
2.11.4.GIT