From 708906b081cff4913844677c5602b36e48eceb11 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Tue, 14 Oct 2003 20:29:59 +0000
Subject: [PATCH] 2003-10-14  Mike Kestner  <mkestner@ximian.com>

	* gtk/gtk-api.xml : regenerated
	* gtk/Gtk.metadata : begin the port of the Gtk rules
	* gtk/Makefile.in : apply metadata in gen target
	* gtkhtml/gtkhtml-api.xml : regenerated
	* gtkhtml/Gtk.metadata : a couple rules ported
	* gtkhtml/Makefile.in : apply metadata in gen target
	* sources/Gtk.metadata : port first 350 lines of rules.

svn path=/trunk/gtk-sharp/; revision=19047
---
 ChangeLog               |    10 +
 gtk/Gtk.metadata        |    65 +
 gtk/Makefile.in         |     3 +-
 gtk/gtk-api.xml         | 12791 +++++++++++++++++++-------------------
 gtkhtml/Gtk.metadata    |     7 +
 gtkhtml/Makefile.in     |     3 +-
 gtkhtml/gtkhtml-api.xml |  1033 ++-
 sources/Gtk.metadata    |   336 -
 8 files changed, 6997 insertions(+), 7251 deletions(-)
 create mode 100644 gtk/Gtk.metadata
 create mode 100644 gtkhtml/Gtk.metadata

diff --git a/ChangeLog b/ChangeLog
index 81fb37ce0..ef8876051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-14  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/gtk-api.xml : regenerated
+	* gtk/Gtk.metadata : begin the port of the Gtk rules
+	* gtk/Makefile.in : apply metadata in gen target
+	* gtkhtml/gtkhtml-api.xml : regenerated
+	* gtkhtml/Gtk.metadata : a couple rules ported
+	* gtkhtml/Makefile.in : apply metadata in gen target
+	* sources/Gtk.metadata : port first 350 lines of rules.
+
 2003-10-14  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/gtk-api.xml : regenerated
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
new file mode 100644
index 000000000..db93aece0
--- /dev/null
+++ b/gtk/Gtk.metadata
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFromString']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterChildren']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNext']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNthChild']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterParent']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkButton']/constructor[@cname='gtk_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkLabel']/constructor[@cname='gtk_label_new']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkMenuItem']/constructor[@cname='gtk_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
+  <attr path="//object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
+  <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkRadioMenuItem']/constructor[@cname='gtk_radio_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkScrolledWindow']/method[@name='GetPolicy']/*/*[@type='GtkPolicyType*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetEndIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtChildAnchor']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineIndex']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtMark']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetSelectionBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetStartIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextLayout']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/constructor[@cname='gtk_tree_store_newv']/parameters" name="va_type">length_param</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetCellArea']/*/*[@name='rect']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='focus_column']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='path']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='pos']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='path']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='path']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='ClassPath']/*/*[@type='gchar**']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Intersect']/*/*[@name='intersection']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">ref</attr>
+</metadata>
+
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 913d6531b..4c209c66b 100755
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -11,7 +11,8 @@ ASSEMBLY=gtk-sharp.dll
 
 all: $(ASSEMBLY)
 
-generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe
+generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gtk.metadata
+	$(RUNTIME) ../parser/gapi-fixup.exe --api=gtk-api.xml --metadata=Gtk.metadata && \
 	$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) 	\
 	--include $(INCLUDE_APIS) --outdir=generated --customdir=.	\
 	--assembly-name=gtk-sharp && touch generated-stamp
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index 4649b60d6..314dc1431 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<api>
-<!--
+<api><!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@@ -8,13293 +7,13293 @@
 -->
   <namespace name="Gtk" library="libgtk-win32-2.0-0.dll">
     <enum name="AccelFlags" cname="GtkAccelFlags" type="flags">
-      <member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_ACCEL_MASK" name="Mask" value="0x07"/>
+      <member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0" />
+      <member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1" />
+      <member cname="GTK_ACCEL_MASK" name="Mask" value="0x07" />
     </enum>
     <enum name="AnchorType" cname="GtkAnchorType" type="enum">
-      <member cname="GTK_ANCHOR_CENTER" name="Center"/>
-      <member cname="GTK_ANCHOR_NORTH" name="North"/>
-      <member cname="GTK_ANCHOR_NORTH_WEST" name="NorthWest"/>
-      <member cname="GTK_ANCHOR_NORTH_EAST" name="NorthEast"/>
-      <member cname="GTK_ANCHOR_SOUTH" name="South"/>
-      <member cname="GTK_ANCHOR_SOUTH_WEST" name="SouthWest"/>
-      <member cname="GTK_ANCHOR_SOUTH_EAST" name="SouthEast"/>
-      <member cname="GTK_ANCHOR_WEST" name="West"/>
-      <member cname="GTK_ANCHOR_EAST" name="East"/>
-      <member cname="GTK_ANCHOR_N" name="N"/>
-      <member cname="GTK_ANCHOR_NW" name="Nw"/>
-      <member cname="GTK_ANCHOR_NE" name="Ne"/>
-      <member cname="GTK_ANCHOR_S" name="S"/>
-      <member cname="GTK_ANCHOR_SW" name="Sw"/>
-      <member cname="GTK_ANCHOR_SE" name="Se"/>
-      <member cname="GTK_ANCHOR_W" name="W"/>
-      <member cname="GTK_ANCHOR_E" name="E"/>
+      <member cname="GTK_ANCHOR_CENTER" name="Center" />
+      <member cname="GTK_ANCHOR_NORTH" name="North" />
+      <member cname="GTK_ANCHOR_NORTH_WEST" name="NorthWest" />
+      <member cname="GTK_ANCHOR_NORTH_EAST" name="NorthEast" />
+      <member cname="GTK_ANCHOR_SOUTH" name="South" />
+      <member cname="GTK_ANCHOR_SOUTH_WEST" name="SouthWest" />
+      <member cname="GTK_ANCHOR_SOUTH_EAST" name="SouthEast" />
+      <member cname="GTK_ANCHOR_WEST" name="West" />
+      <member cname="GTK_ANCHOR_EAST" name="East" />
+      <member cname="GTK_ANCHOR_N" name="N" />
+      <member cname="GTK_ANCHOR_NW" name="Nw" />
+      <member cname="GTK_ANCHOR_NE" name="Ne" />
+      <member cname="GTK_ANCHOR_S" name="S" />
+      <member cname="GTK_ANCHOR_SW" name="Sw" />
+      <member cname="GTK_ANCHOR_SE" name="Se" />
+      <member cname="GTK_ANCHOR_W" name="W" />
+      <member cname="GTK_ANCHOR_E" name="E" />
     </enum>
     <enum name="ArrowType" cname="GtkArrowType" type="enum">
-      <member cname="GTK_ARROW_UP" name="Up"/>
-      <member cname="GTK_ARROW_DOWN" name="Down"/>
-      <member cname="GTK_ARROW_LEFT" name="Left"/>
-      <member cname="GTK_ARROW_RIGHT" name="Right"/>
+      <member cname="GTK_ARROW_UP" name="Up" />
+      <member cname="GTK_ARROW_DOWN" name="Down" />
+      <member cname="GTK_ARROW_LEFT" name="Left" />
+      <member cname="GTK_ARROW_RIGHT" name="Right" />
     </enum>
     <enum name="AttachOptions" cname="GtkAttachOptions" type="flags">
-      <member cname="GTK_EXPAND" name="Expand" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_SHRINK" name="Shrink" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_FILL" name="Fill" value="1 &lt;&lt; 2"/>
+      <member cname="GTK_EXPAND" name="Expand" value="1 &lt;&lt; 0" />
+      <member cname="GTK_SHRINK" name="Shrink" value="1 &lt;&lt; 1" />
+      <member cname="GTK_FILL" name="Fill" value="1 &lt;&lt; 2" />
     </enum>
     <enum name="ButtonBoxStyle" cname="GtkButtonBoxStyle" type="enum">
-      <member cname="GTK_BUTTONBOX_DEFAULT_STYLE" name="DefaultStyle"/>
-      <member cname="GTK_BUTTONBOX_SPREAD" name="Spread"/>
-      <member cname="GTK_BUTTONBOX_EDGE" name="Edge"/>
-      <member cname="GTK_BUTTONBOX_START" name="Start"/>
-      <member cname="GTK_BUTTONBOX_END" name="End"/>
+      <member cname="GTK_BUTTONBOX_DEFAULT_STYLE" name="DefaultStyle" />
+      <member cname="GTK_BUTTONBOX_SPREAD" name="Spread" />
+      <member cname="GTK_BUTTONBOX_EDGE" name="Edge" />
+      <member cname="GTK_BUTTONBOX_START" name="Start" />
+      <member cname="GTK_BUTTONBOX_END" name="End" />
     </enum>
     <enum name="ButtonsType" cname="GtkButtonsType" type="enum">
-      <member cname="GTK_BUTTONS_NONE" name="None"/>
-      <member cname="GTK_BUTTONS_OK" name="Ok"/>
-      <member cname="GTK_BUTTONS_CLOSE" name="Close"/>
-      <member cname="GTK_BUTTONS_CANCEL" name="Cancel"/>
-      <member cname="GTK_BUTTONS_YES_NO" name="YesNo"/>
-      <member cname="GTK_BUTTONS_OK_CANCEL" name="OkCancel"/>
+      <member cname="GTK_BUTTONS_NONE" name="None" />
+      <member cname="GTK_BUTTONS_OK" name="Ok" />
+      <member cname="GTK_BUTTONS_CLOSE" name="Close" />
+      <member cname="GTK_BUTTONS_CANCEL" name="Cancel" />
+      <member cname="GTK_BUTTONS_YES_NO" name="YesNo" />
+      <member cname="GTK_BUTTONS_OK_CANCEL" name="OkCancel" />
     </enum>
     <enum name="CalendarDisplayOptions" cname="GtkCalendarDisplayOptions" type="flags">
-      <member cname="GTK_CALENDAR_SHOW_HEADING" name="ShowHeading" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_CALENDAR_SHOW_DAY_NAMES" name="ShowDayNames" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_CALENDAR_NO_MONTH_CHANGE" name="NoMonthChange" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_CALENDAR_SHOW_WEEK_NUMBERS" name="ShowWeekNumbers" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_CALENDAR_WEEK_START_MONDAY" name="WeekStartMonday" value="1 &lt;&lt; 4"/>
+      <member cname="GTK_CALENDAR_SHOW_HEADING" name="ShowHeading" value="1 &lt;&lt; 0" />
+      <member cname="GTK_CALENDAR_SHOW_DAY_NAMES" name="ShowDayNames" value="1 &lt;&lt; 1" />
+      <member cname="GTK_CALENDAR_NO_MONTH_CHANGE" name="NoMonthChange" value="1 &lt;&lt; 2" />
+      <member cname="GTK_CALENDAR_SHOW_WEEK_NUMBERS" name="ShowWeekNumbers" value="1 &lt;&lt; 3" />
+      <member cname="GTK_CALENDAR_WEEK_START_MONDAY" name="WeekStartMonday" value="1 &lt;&lt; 4" />
     </enum>
     <enum name="CellRendererMode" cname="GtkCellRendererMode" type="enum">
-      <member cname="GTK_CELL_RENDERER_MODE_INERT" name="Inert"/>
-      <member cname="GTK_CELL_RENDERER_MODE_ACTIVATABLE" name="Activatable"/>
-      <member cname="GTK_CELL_RENDERER_MODE_EDITABLE" name="Editable"/>
+      <member cname="GTK_CELL_RENDERER_MODE_INERT" name="Inert" />
+      <member cname="GTK_CELL_RENDERER_MODE_ACTIVATABLE" name="Activatable" />
+      <member cname="GTK_CELL_RENDERER_MODE_EDITABLE" name="Editable" />
     </enum>
     <enum name="CellRendererState" cname="GtkCellRendererState" type="flags">
-      <member cname="GTK_CELL_RENDERER_SELECTED" name="Selected" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_CELL_RENDERER_PRELIT" name="Prelit" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_CELL_RENDERER_INSENSITIVE" name="Insensitive" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_CELL_RENDERER_SORTED" name="Sorted" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_CELL_RENDERER_FOCUSED" name="Focused" value="1 &lt;&lt; 4"/>
+      <member cname="GTK_CELL_RENDERER_SELECTED" name="Selected" value="1 &lt;&lt; 0" />
+      <member cname="GTK_CELL_RENDERER_PRELIT" name="Prelit" value="1 &lt;&lt; 1" />
+      <member cname="GTK_CELL_RENDERER_INSENSITIVE" name="Insensitive" value="1 &lt;&lt; 2" />
+      <member cname="GTK_CELL_RENDERER_SORTED" name="Sorted" value="1 &lt;&lt; 3" />
+      <member cname="GTK_CELL_RENDERER_FOCUSED" name="Focused" value="1 &lt;&lt; 4" />
     </enum>
     <enum name="CornerType" cname="GtkCornerType" type="enum">
-      <member cname="GTK_CORNER_TOP_LEFT" name="TopLeft"/>
-      <member cname="GTK_CORNER_BOTTOM_LEFT" name="BottomLeft"/>
-      <member cname="GTK_CORNER_TOP_RIGHT" name="TopRight"/>
-      <member cname="GTK_CORNER_BOTTOM_RIGHT" name="BottomRight"/>
+      <member cname="GTK_CORNER_TOP_LEFT" name="TopLeft" />
+      <member cname="GTK_CORNER_BOTTOM_LEFT" name="BottomLeft" />
+      <member cname="GTK_CORNER_TOP_RIGHT" name="TopRight" />
+      <member cname="GTK_CORNER_BOTTOM_RIGHT" name="BottomRight" />
     </enum>
     <enum name="CurveType" cname="GtkCurveType" type="enum">
-      <member cname="GTK_CURVE_TYPE_LINEAR" name="Linear"/>
-      <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline"/>
-      <member cname="GTK_CURVE_TYPE_FREE" name="Free"/>
+      <member cname="GTK_CURVE_TYPE_LINEAR" name="Linear" />
+      <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline" />
+      <member cname="GTK_CURVE_TYPE_FREE" name="Free" />
     </enum>
     <enum name="DebugFlag" cname="GtkDebugFlag" type="flags" hidden="1">
-      <member cname="GTK_DEBUG_MISC" name="Misc" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_DEBUG_PLUGSOCKET" name="Plugsocket" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_DEBUG_TEXT" name="Text" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_DEBUG_TREE" name="Tree" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_DEBUG_UPDATES" name="Updates" value="1 &lt;&lt; 4"/>
-      <member cname="GTK_DEBUG_KEYBINDINGS" name="Keybindings" value="1 &lt;&lt; 5"/>
-      <member cname="GTK_DEBUG_MULTIHEAD" name="Multihead" value="1 &lt;&lt; 6"/>
+      <member cname="GTK_DEBUG_MISC" name="Misc" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DEBUG_PLUGSOCKET" name="Plugsocket" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DEBUG_TEXT" name="Text" value="1 &lt;&lt; 2" />
+      <member cname="GTK_DEBUG_TREE" name="Tree" value="1 &lt;&lt; 3" />
+      <member cname="GTK_DEBUG_UPDATES" name="Updates" value="1 &lt;&lt; 4" />
+      <member cname="GTK_DEBUG_KEYBINDINGS" name="Keybindings" value="1 &lt;&lt; 5" />
+      <member cname="GTK_DEBUG_MULTIHEAD" name="Multihead" value="1 &lt;&lt; 6" />
     </enum>
     <enum name="DeleteType" cname="GtkDeleteType" type="enum">
-      <member cname="GTK_DELETE_CHARS" name="Chars"/>
-      <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds"/>
-      <member cname="GTK_DELETE_WORDS" name="Words"/>
-      <member cname="GTK_DELETE_DISPLAY_LINES" name="DisplayLines"/>
-      <member cname="GTK_DELETE_DISPLAY_LINE_ENDS" name="DisplayLineEnds"/>
-      <member cname="GTK_DELETE_PARAGRAPH_ENDS" name="ParagraphEnds"/>
-      <member cname="GTK_DELETE_PARAGRAPHS" name="Paragraphs"/>
-      <member cname="GTK_DELETE_WHITESPACE" name="Whitespace"/>
+      <member cname="GTK_DELETE_CHARS" name="Chars" />
+      <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds" />
+      <member cname="GTK_DELETE_WORDS" name="Words" />
+      <member cname="GTK_DELETE_DISPLAY_LINES" name="DisplayLines" />
+      <member cname="GTK_DELETE_DISPLAY_LINE_ENDS" name="DisplayLineEnds" />
+      <member cname="GTK_DELETE_PARAGRAPH_ENDS" name="ParagraphEnds" />
+      <member cname="GTK_DELETE_PARAGRAPHS" name="Paragraphs" />
+      <member cname="GTK_DELETE_WHITESPACE" name="Whitespace" />
     </enum>
     <enum name="DestDefaults" cname="GtkDestDefaults" type="flags" hidden="1">
-      <member cname="GTK_DEST_DEFAULT_MOTION" name="Motion" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_DEST_DEFAULT_HIGHLIGHT" name="Highlight" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_DEST_DEFAULT_DROP" name="Drop" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_DEST_DEFAULT_ALL" name="All" value="0x07"/>
+      <member cname="GTK_DEST_DEFAULT_MOTION" name="Motion" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DEST_DEFAULT_HIGHLIGHT" name="Highlight" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DEST_DEFAULT_DROP" name="Drop" value="1 &lt;&lt; 2" />
+      <member cname="GTK_DEST_DEFAULT_ALL" name="All" value="0x07" />
     </enum>
     <enum name="DialogFlags" cname="GtkDialogFlags" type="flags">
-      <member cname="GTK_DIALOG_MODAL" name="Modal" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_DIALOG_DESTROY_WITH_PARENT" name="DestroyWithParent" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_DIALOG_NO_SEPARATOR" name="NoSeparator" value="1 &lt;&lt; 2"/>
+      <member cname="GTK_DIALOG_MODAL" name="Modal" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DIALOG_DESTROY_WITH_PARENT" name="DestroyWithParent" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DIALOG_NO_SEPARATOR" name="NoSeparator" value="1 &lt;&lt; 2" />
     </enum>
     <enum name="DirectionType" cname="GtkDirectionType" type="enum">
-      <member cname="GTK_DIR_TAB_FORWARD" name="TabForward"/>
-      <member cname="GTK_DIR_TAB_BACKWARD" name="TabBackward"/>
-      <member cname="GTK_DIR_UP" name="Up"/>
-      <member cname="GTK_DIR_DOWN" name="Down"/>
-      <member cname="GTK_DIR_LEFT" name="Left"/>
-      <member cname="GTK_DIR_RIGHT" name="Right"/>
+      <member cname="GTK_DIR_TAB_FORWARD" name="TabForward" />
+      <member cname="GTK_DIR_TAB_BACKWARD" name="TabBackward" />
+      <member cname="GTK_DIR_UP" name="Up" />
+      <member cname="GTK_DIR_DOWN" name="Down" />
+      <member cname="GTK_DIR_LEFT" name="Left" />
+      <member cname="GTK_DIR_RIGHT" name="Right" />
     </enum>
     <enum name="ExpanderStyle" cname="GtkExpanderStyle" type="enum" hidden="1">
-      <member cname="GTK_EXPANDER_COLLAPSED" name="Collapsed"/>
-      <member cname="GTK_EXPANDER_SEMI_COLLAPSED" name="SemiCollapsed"/>
-      <member cname="GTK_EXPANDER_SEMI_EXPANDED" name="SemiExpanded"/>
-      <member cname="GTK_EXPANDER_EXPANDED" name="Expanded"/>
+      <member cname="GTK_EXPANDER_COLLAPSED" name="Collapsed" />
+      <member cname="GTK_EXPANDER_SEMI_COLLAPSED" name="SemiCollapsed" />
+      <member cname="GTK_EXPANDER_SEMI_EXPANDED" name="SemiExpanded" />
+      <member cname="GTK_EXPANDER_EXPANDED" name="Expanded" />
     </enum>
     <enum name="IMPreeditStyle" cname="GtkIMPreeditStyle" type="enum">
-      <member cname="GTK_IM_PREEDIT_NOTHING" name="Nothing"/>
-      <member cname="GTK_IM_PREEDIT_CALLBACK" name="Callback"/>
+      <member cname="GTK_IM_PREEDIT_NOTHING" name="Nothing" />
+      <member cname="GTK_IM_PREEDIT_CALLBACK" name="Callback" />
     </enum>
     <enum name="IMStatusStyle" cname="GtkIMStatusStyle" type="enum">
-      <member cname="GTK_IM_STATUS_NOTHING" name="Nothing"/>
-      <member cname="GTK_IM_STATUS_CALLBACK" name="Callback"/>
+      <member cname="GTK_IM_STATUS_NOTHING" name="Nothing" />
+      <member cname="GTK_IM_STATUS_CALLBACK" name="Callback" />
     </enum>
     <enum name="IconSize" cname="GtkIconSize" type="enum">
-      <member cname="GTK_ICON_SIZE_INVALID" name="Invalid"/>
-      <member cname="GTK_ICON_SIZE_MENU" name="Menu"/>
-      <member cname="GTK_ICON_SIZE_SMALL_TOOLBAR" name="SmallToolbar"/>
-      <member cname="GTK_ICON_SIZE_LARGE_TOOLBAR" name="LargeToolbar"/>
-      <member cname="GTK_ICON_SIZE_BUTTON" name="Button"/>
-      <member cname="GTK_ICON_SIZE_DND" name="Dnd"/>
-      <member cname="GTK_ICON_SIZE_DIALOG" name="Dialog"/>
+      <member cname="GTK_ICON_SIZE_INVALID" name="Invalid" />
+      <member cname="GTK_ICON_SIZE_MENU" name="Menu" />
+      <member cname="GTK_ICON_SIZE_SMALL_TOOLBAR" name="SmallToolbar" />
+      <member cname="GTK_ICON_SIZE_LARGE_TOOLBAR" name="LargeToolbar" />
+      <member cname="GTK_ICON_SIZE_BUTTON" name="Button" />
+      <member cname="GTK_ICON_SIZE_DND" name="Dnd" />
+      <member cname="GTK_ICON_SIZE_DIALOG" name="Dialog" />
     </enum>
     <enum name="ImageType" cname="GtkImageType" type="enum">
-      <member cname="GTK_IMAGE_EMPTY" name="Empty"/>
-      <member cname="GTK_IMAGE_PIXMAP" name="Pixmap"/>
-      <member cname="GTK_IMAGE_IMAGE" name="Image"/>
-      <member cname="GTK_IMAGE_PIXBUF" name="Pixbuf"/>
-      <member cname="GTK_IMAGE_STOCK" name="Stock"/>
-      <member cname="GTK_IMAGE_ICON_SET" name="IconSet"/>
-      <member cname="GTK_IMAGE_ANIMATION" name="Animation"/>
+      <member cname="GTK_IMAGE_EMPTY" name="Empty" />
+      <member cname="GTK_IMAGE_PIXMAP" name="Pixmap" />
+      <member cname="GTK_IMAGE_IMAGE" name="Image" />
+      <member cname="GTK_IMAGE_PIXBUF" name="Pixbuf" />
+      <member cname="GTK_IMAGE_STOCK" name="Stock" />
+      <member cname="GTK_IMAGE_ICON_SET" name="IconSet" />
+      <member cname="GTK_IMAGE_ANIMATION" name="Animation" />
     </enum>
     <enum name="Justification" cname="GtkJustification" type="enum">
-      <member cname="GTK_JUSTIFY_LEFT" name="Left"/>
-      <member cname="GTK_JUSTIFY_RIGHT" name="Right"/>
-      <member cname="GTK_JUSTIFY_CENTER" name="Center"/>
-      <member cname="GTK_JUSTIFY_FILL" name="Fill"/>
+      <member cname="GTK_JUSTIFY_LEFT" name="Left" />
+      <member cname="GTK_JUSTIFY_RIGHT" name="Right" />
+      <member cname="GTK_JUSTIFY_CENTER" name="Center" />
+      <member cname="GTK_JUSTIFY_FILL" name="Fill" />
     </enum>
     <enum name="MenuDirectionType" cname="GtkMenuDirectionType" type="enum">
-      <member cname="GTK_MENU_DIR_PARENT" name="Parent"/>
-      <member cname="GTK_MENU_DIR_CHILD" name="Child"/>
-      <member cname="GTK_MENU_DIR_NEXT" name="Next"/>
-      <member cname="GTK_MENU_DIR_PREV" name="Prev"/>
+      <member cname="GTK_MENU_DIR_PARENT" name="Parent" />
+      <member cname="GTK_MENU_DIR_CHILD" name="Child" />
+      <member cname="GTK_MENU_DIR_NEXT" name="Next" />
+      <member cname="GTK_MENU_DIR_PREV" name="Prev" />
     </enum>
     <enum name="MessageType" cname="GtkMessageType" type="enum">
-      <member cname="GTK_MESSAGE_INFO" name="Info"/>
-      <member cname="GTK_MESSAGE_WARNING" name="Warning"/>
-      <member cname="GTK_MESSAGE_QUESTION" name="Question"/>
-      <member cname="GTK_MESSAGE_ERROR" name="Error"/>
+      <member cname="GTK_MESSAGE_INFO" name="Info" />
+      <member cname="GTK_MESSAGE_WARNING" name="Warning" />
+      <member cname="GTK_MESSAGE_QUESTION" name="Question" />
+      <member cname="GTK_MESSAGE_ERROR" name="Error" />
     </enum>
     <enum name="MetricType" cname="GtkMetricType" type="enum">
-      <member cname="GTK_PIXELS" name="Pixels"/>
-      <member cname="GTK_INCHES" name="Inches"/>
-      <member cname="GTK_CENTIMETERS" name="Centimeters"/>
+      <member cname="GTK_PIXELS" name="Pixels" />
+      <member cname="GTK_INCHES" name="Inches" />
+      <member cname="GTK_CENTIMETERS" name="Centimeters" />
     </enum>
     <enum name="MovementStep" cname="GtkMovementStep" type="enum">
-      <member cname="GTK_MOVEMENT_LOGICAL_POSITIONS" name="LogicalPositions"/>
-      <member cname="GTK_MOVEMENT_VISUAL_POSITIONS" name="VisualPositions"/>
-      <member cname="GTK_MOVEMENT_WORDS" name="Words"/>
-      <member cname="GTK_MOVEMENT_DISPLAY_LINES" name="DisplayLines"/>
-      <member cname="GTK_MOVEMENT_DISPLAY_LINE_ENDS" name="DisplayLineEnds"/>
-      <member cname="GTK_MOVEMENT_PARAGRAPHS" name="Paragraphs"/>
-      <member cname="GTK_MOVEMENT_PARAGRAPH_ENDS" name="ParagraphEnds"/>
-      <member cname="GTK_MOVEMENT_PAGES" name="Pages"/>
-      <member cname="GTK_MOVEMENT_BUFFER_ENDS" name="BufferEnds"/>
+      <member cname="GTK_MOVEMENT_LOGICAL_POSITIONS" name="LogicalPositions" />
+      <member cname="GTK_MOVEMENT_VISUAL_POSITIONS" name="VisualPositions" />
+      <member cname="GTK_MOVEMENT_WORDS" name="Words" />
+      <member cname="GTK_MOVEMENT_DISPLAY_LINES" name="DisplayLines" />
+      <member cname="GTK_MOVEMENT_DISPLAY_LINE_ENDS" name="DisplayLineEnds" />
+      <member cname="GTK_MOVEMENT_PARAGRAPHS" name="Paragraphs" />
+      <member cname="GTK_MOVEMENT_PARAGRAPH_ENDS" name="ParagraphEnds" />
+      <member cname="GTK_MOVEMENT_PAGES" name="Pages" />
+      <member cname="GTK_MOVEMENT_BUFFER_ENDS" name="BufferEnds" />
     </enum>
     <enum name="NotebookTab" cname="GtkNotebookTab" type="enum">
-      <member cname="GTK_NOTEBOOK_TAB_FIRST" name="First"/>
-      <member cname="GTK_NOTEBOOK_TAB_LAST" name="Last"/>
+      <member cname="GTK_NOTEBOOK_TAB_FIRST" name="First" />
+      <member cname="GTK_NOTEBOOK_TAB_LAST" name="Last" />
     </enum>
     <enum name="ObjectFlags" cname="GtkObjectFlags" type="flags" hidden="1">
-      <member cname="GTK_IN_DESTRUCTION" name="InDestruction" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_FLOATING" name="Floating" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_RESERVED_1" name="Reserved1" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_RESERVED_2" name="Reserved2" value="1 &lt;&lt; 3"/>
+      <member cname="GTK_IN_DESTRUCTION" name="InDestruction" value="1 &lt;&lt; 0" />
+      <member cname="GTK_FLOATING" name="Floating" value="1 &lt;&lt; 1" />
+      <member cname="GTK_RESERVED_1" name="Reserved1" value="1 &lt;&lt; 2" />
+      <member cname="GTK_RESERVED_2" name="Reserved2" value="1 &lt;&lt; 3" />
     </enum>
     <enum name="Orientation" cname="GtkOrientation" type="enum">
-      <member cname="GTK_ORIENTATION_HORIZONTAL" name="Horizontal"/>
-      <member cname="GTK_ORIENTATION_VERTICAL" name="Vertical"/>
+      <member cname="GTK_ORIENTATION_HORIZONTAL" name="Horizontal" />
+      <member cname="GTK_ORIENTATION_VERTICAL" name="Vertical" />
     </enum>
     <enum name="PackType" cname="GtkPackType" type="enum">
-      <member cname="GTK_PACK_START" name="Start"/>
-      <member cname="GTK_PACK_END" name="End"/>
+      <member cname="GTK_PACK_START" name="Start" />
+      <member cname="GTK_PACK_END" name="End" />
     </enum>
     <enum name="PathPriorityType" cname="GtkPathPriorityType" type="enum" hidden="1">
-      <member cname="GTK_PATH_PRIO_LOWEST" name="Lowest"/>
-      <member cname="GTK_PATH_PRIO_GTK" name="Gtk" value="4"/>
-      <member cname="GTK_PATH_PRIO_APPLICATION" name="Application" value="8"/>
-      <member cname="GTK_PATH_PRIO_THEME" name="Theme" value="10"/>
-      <member cname="GTK_PATH_PRIO_RC" name="Rc" value="12"/>
-      <member cname="GTK_PATH_PRIO_HIGHEST" name="Highest" value="15"/>
+      <member cname="GTK_PATH_PRIO_LOWEST" name="Lowest" />
+      <member cname="GTK_PATH_PRIO_GTK" name="Gtk" value="4" />
+      <member cname="GTK_PATH_PRIO_APPLICATION" name="Application" value="8" />
+      <member cname="GTK_PATH_PRIO_THEME" name="Theme" value="10" />
+      <member cname="GTK_PATH_PRIO_RC" name="Rc" value="12" />
+      <member cname="GTK_PATH_PRIO_HIGHEST" name="Highest" value="15" />
     </enum>
     <enum name="PathType" cname="GtkPathType" type="enum" hidden="1">
-      <member cname="GTK_PATH_WIDGET" name="Widget"/>
-      <member cname="GTK_PATH_WIDGET_CLASS" name="WidgetClass"/>
-      <member cname="GTK_PATH_CLASS" name="Class"/>
+      <member cname="GTK_PATH_WIDGET" name="Widget" />
+      <member cname="GTK_PATH_WIDGET_CLASS" name="WidgetClass" />
+      <member cname="GTK_PATH_CLASS" name="Class" />
     </enum>
     <enum name="PolicyType" cname="GtkPolicyType" type="enum">
-      <member cname="GTK_POLICY_ALWAYS" name="Always"/>
-      <member cname="GTK_POLICY_AUTOMATIC" name="Automatic"/>
-      <member cname="GTK_POLICY_NEVER" name="Never"/>
+      <member cname="GTK_POLICY_ALWAYS" name="Always" />
+      <member cname="GTK_POLICY_AUTOMATIC" name="Automatic" />
+      <member cname="GTK_POLICY_NEVER" name="Never" />
     </enum>
     <enum name="PositionType" cname="GtkPositionType" type="enum">
-      <member cname="GTK_POS_LEFT" name="Left"/>
-      <member cname="GTK_POS_RIGHT" name="Right"/>
-      <member cname="GTK_POS_TOP" name="Top"/>
-      <member cname="GTK_POS_BOTTOM" name="Bottom"/>
+      <member cname="GTK_POS_LEFT" name="Left" />
+      <member cname="GTK_POS_RIGHT" name="Right" />
+      <member cname="GTK_POS_TOP" name="Top" />
+      <member cname="GTK_POS_BOTTOM" name="Bottom" />
     </enum>
     <enum name="ProgressBarOrientation" cname="GtkProgressBarOrientation" type="enum">
-      <member cname="GTK_PROGRESS_LEFT_TO_RIGHT" name="LeftToRight"/>
-      <member cname="GTK_PROGRESS_RIGHT_TO_LEFT" name="RightToLeft"/>
-      <member cname="GTK_PROGRESS_BOTTOM_TO_TOP" name="BottomToTop"/>
-      <member cname="GTK_PROGRESS_TOP_TO_BOTTOM" name="TopToBottom"/>
+      <member cname="GTK_PROGRESS_LEFT_TO_RIGHT" name="LeftToRight" />
+      <member cname="GTK_PROGRESS_RIGHT_TO_LEFT" name="RightToLeft" />
+      <member cname="GTK_PROGRESS_BOTTOM_TO_TOP" name="BottomToTop" />
+      <member cname="GTK_PROGRESS_TOP_TO_BOTTOM" name="TopToBottom" />
     </enum>
     <enum name="ProgressBarStyle" cname="GtkProgressBarStyle" type="enum">
-      <member cname="GTK_PROGRESS_CONTINUOUS" name="Continuous"/>
-      <member cname="GTK_PROGRESS_DISCRETE" name="Discrete"/>
+      <member cname="GTK_PROGRESS_CONTINUOUS" name="Continuous" />
+      <member cname="GTK_PROGRESS_DISCRETE" name="Discrete" />
     </enum>
     <enum name="RBNodeColor" cname="GtkRBNodeColor" type="flags" hidden="1">
-      <member cname="GTK_RBNODE_BLACK" name="Black" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_RBNODE_RED" name="Red" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_RBNODE_IS_PARENT" name="IsParent" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_RBNODE_IS_SELECTED" name="IsSelected" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_RBNODE_IS_PRELIT" name="IsPrelit" value="1 &lt;&lt; 4"/>
-      <member cname="GTK_RBNODE_IS_SEMI_COLLAPSED" name="IsSemiCollapsed" value="1 &lt;&lt; 5"/>
-      <member cname="GTK_RBNODE_IS_SEMI_EXPANDED" name="IsSemiExpanded" value="1 &lt;&lt; 6"/>
-      <member cname="GTK_RBNODE_INVALID" name="Invalid" value="1 &lt;&lt; 7"/>
-      <member cname="GTK_RBNODE_COLUMN_INVALID" name="ColumnInvalid" value="1 &lt;&lt; 8"/>
-      <member cname="GTK_RBNODE_DESCENDANTS_INVALID" name="DescendantsInvalid" value="1 &lt;&lt; 9"/>
-      <member cname="GTK_RBNODE_NON_COLORS" name="NonColors"/>
+      <member cname="GTK_RBNODE_BLACK" name="Black" value="1 &lt;&lt; 0" />
+      <member cname="GTK_RBNODE_RED" name="Red" value="1 &lt;&lt; 1" />
+      <member cname="GTK_RBNODE_IS_PARENT" name="IsParent" value="1 &lt;&lt; 2" />
+      <member cname="GTK_RBNODE_IS_SELECTED" name="IsSelected" value="1 &lt;&lt; 3" />
+      <member cname="GTK_RBNODE_IS_PRELIT" name="IsPrelit" value="1 &lt;&lt; 4" />
+      <member cname="GTK_RBNODE_IS_SEMI_COLLAPSED" name="IsSemiCollapsed" value="1 &lt;&lt; 5" />
+      <member cname="GTK_RBNODE_IS_SEMI_EXPANDED" name="IsSemiExpanded" value="1 &lt;&lt; 6" />
+      <member cname="GTK_RBNODE_INVALID" name="Invalid" value="1 &lt;&lt; 7" />
+      <member cname="GTK_RBNODE_COLUMN_INVALID" name="ColumnInvalid" value="1 &lt;&lt; 8" />
+      <member cname="GTK_RBNODE_DESCENDANTS_INVALID" name="DescendantsInvalid" value="1 &lt;&lt; 9" />
+      <member cname="GTK_RBNODE_NON_COLORS" name="NonColors" />
     </enum>
     <enum name="RcFlags" cname="GtkRcFlags" type="flags" hidden="1">
-      <member cname="GTK_RC_FG" name="Fg" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_RC_BG" name="Bg" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_RC_TEXT" name="Text" value="1 &lt;&lt; 2"/>
-      <member cname="GTK_RC_BASE" name="Base" value="1 &lt;&lt; 3"/>
+      <member cname="GTK_RC_FG" name="Fg" value="1 &lt;&lt; 0" />
+      <member cname="GTK_RC_BG" name="Bg" value="1 &lt;&lt; 1" />
+      <member cname="GTK_RC_TEXT" name="Text" value="1 &lt;&lt; 2" />
+      <member cname="GTK_RC_BASE" name="Base" value="1 &lt;&lt; 3" />
     </enum>
     <enum name="RcTokenType" cname="GtkRcTokenType" type="enum">
-      <member cname="GTK_RC_TOKEN_INVALID" name="Invalid"/>
-      <member cname="GTK_RC_TOKEN_INCLUDE" name="Include"/>
-      <member cname="GTK_RC_TOKEN_NORMAL" name="Normal"/>
-      <member cname="GTK_RC_TOKEN_ACTIVE" name="Active"/>
-      <member cname="GTK_RC_TOKEN_PRELIGHT" name="Prelight"/>
-      <member cname="GTK_RC_TOKEN_SELECTED" name="Selected"/>
-      <member cname="GTK_RC_TOKEN_INSENSITIVE" name="Insensitive"/>
-      <member cname="GTK_RC_TOKEN_FG" name="Fg"/>
-      <member cname="GTK_RC_TOKEN_BG" name="Bg"/>
-      <member cname="GTK_RC_TOKEN_TEXT" name="Text"/>
-      <member cname="GTK_RC_TOKEN_BASE" name="Base"/>
-      <member cname="GTK_RC_TOKEN_XTHICKNESS" name="Xthickness"/>
-      <member cname="GTK_RC_TOKEN_YTHICKNESS" name="Ythickness"/>
-      <member cname="GTK_RC_TOKEN_FONT" name="Font"/>
-      <member cname="GTK_RC_TOKEN_FONTSET" name="Fontset"/>
-      <member cname="GTK_RC_TOKEN_FONT_NAME" name="FontName"/>
-      <member cname="GTK_RC_TOKEN_BG_PIXMAP" name="BgPixmap"/>
-      <member cname="GTK_RC_TOKEN_PIXMAP_PATH" name="PixmapPath"/>
-      <member cname="GTK_RC_TOKEN_STYLE" name="Style"/>
-      <member cname="GTK_RC_TOKEN_BINDING" name="Binding"/>
-      <member cname="GTK_RC_TOKEN_BIND" name="Bind"/>
-      <member cname="GTK_RC_TOKEN_WIDGET" name="Widget"/>
-      <member cname="GTK_RC_TOKEN_WIDGET_CLASS" name="WidgetClass"/>
-      <member cname="GTK_RC_TOKEN_CLASS" name="Class"/>
-      <member cname="GTK_RC_TOKEN_LOWEST" name="Lowest"/>
-      <member cname="GTK_RC_TOKEN_GTK" name="Gtk"/>
-      <member cname="GTK_RC_TOKEN_APPLICATION" name="Application"/>
-      <member cname="GTK_RC_TOKEN_THEME" name="Theme"/>
-      <member cname="GTK_RC_TOKEN_RC" name="Rc"/>
-      <member cname="GTK_RC_TOKEN_HIGHEST" name="Highest"/>
-      <member cname="GTK_RC_TOKEN_ENGINE" name="Engine"/>
-      <member cname="GTK_RC_TOKEN_MODULE_PATH" name="ModulePath"/>
-      <member cname="GTK_RC_TOKEN_IM_MODULE_PATH" name="ImModulePath"/>
-      <member cname="GTK_RC_TOKEN_IM_MODULE_FILE" name="ImModuleFile"/>
-      <member cname="GTK_RC_TOKEN_STOCK" name="Stock"/>
-      <member cname="GTK_RC_TOKEN_LTR" name="Ltr"/>
-      <member cname="GTK_RC_TOKEN_RTL" name="Rtl"/>
-      <member cname="GTK_RC_TOKEN_LAST" name="Last"/>
+      <member cname="GTK_RC_TOKEN_INVALID" name="Invalid" />
+      <member cname="GTK_RC_TOKEN_INCLUDE" name="Include" />
+      <member cname="GTK_RC_TOKEN_NORMAL" name="Normal" />
+      <member cname="GTK_RC_TOKEN_ACTIVE" name="Active" />
+      <member cname="GTK_RC_TOKEN_PRELIGHT" name="Prelight" />
+      <member cname="GTK_RC_TOKEN_SELECTED" name="Selected" />
+      <member cname="GTK_RC_TOKEN_INSENSITIVE" name="Insensitive" />
+      <member cname="GTK_RC_TOKEN_FG" name="Fg" />
+      <member cname="GTK_RC_TOKEN_BG" name="Bg" />
+      <member cname="GTK_RC_TOKEN_TEXT" name="Text" />
+      <member cname="GTK_RC_TOKEN_BASE" name="Base" />
+      <member cname="GTK_RC_TOKEN_XTHICKNESS" name="Xthickness" />
+      <member cname="GTK_RC_TOKEN_YTHICKNESS" name="Ythickness" />
+      <member cname="GTK_RC_TOKEN_FONT" name="Font" />
+      <member cname="GTK_RC_TOKEN_FONTSET" name="Fontset" />
+      <member cname="GTK_RC_TOKEN_FONT_NAME" name="FontName" />
+      <member cname="GTK_RC_TOKEN_BG_PIXMAP" name="BgPixmap" />
+      <member cname="GTK_RC_TOKEN_PIXMAP_PATH" name="PixmapPath" />
+      <member cname="GTK_RC_TOKEN_STYLE" name="Style" />
+      <member cname="GTK_RC_TOKEN_BINDING" name="Binding" />
+      <member cname="GTK_RC_TOKEN_BIND" name="Bind" />
+      <member cname="GTK_RC_TOKEN_WIDGET" name="Widget" />
+      <member cname="GTK_RC_TOKEN_WIDGET_CLASS" name="WidgetClass" />
+      <member cname="GTK_RC_TOKEN_CLASS" name="Class" />
+      <member cname="GTK_RC_TOKEN_LOWEST" name="Lowest" />
+      <member cname="GTK_RC_TOKEN_GTK" name="Gtk" />
+      <member cname="GTK_RC_TOKEN_APPLICATION" name="Application" />
+      <member cname="GTK_RC_TOKEN_THEME" name="Theme" />
+      <member cname="GTK_RC_TOKEN_RC" name="Rc" />
+      <member cname="GTK_RC_TOKEN_HIGHEST" name="Highest" />
+      <member cname="GTK_RC_TOKEN_ENGINE" name="Engine" />
+      <member cname="GTK_RC_TOKEN_MODULE_PATH" name="ModulePath" />
+      <member cname="GTK_RC_TOKEN_IM_MODULE_PATH" name="ImModulePath" />
+      <member cname="GTK_RC_TOKEN_IM_MODULE_FILE" name="ImModuleFile" />
+      <member cname="GTK_RC_TOKEN_STOCK" name="Stock" />
+      <member cname="GTK_RC_TOKEN_LTR" name="Ltr" />
+      <member cname="GTK_RC_TOKEN_RTL" name="Rtl" />
+      <member cname="GTK_RC_TOKEN_LAST" name="Last" />
     </enum>
     <enum name="ReliefStyle" cname="GtkReliefStyle" type="enum">
-      <member cname="GTK_RELIEF_NORMAL" name="Normal"/>
-      <member cname="GTK_RELIEF_HALF" name="Half"/>
-      <member cname="GTK_RELIEF_NONE" name="None"/>
+      <member cname="GTK_RELIEF_NORMAL" name="Normal" />
+      <member cname="GTK_RELIEF_HALF" name="Half" />
+      <member cname="GTK_RELIEF_NONE" name="None" />
     </enum>
     <enum name="ResizeMode" cname="GtkResizeMode" type="enum">
-      <member cname="GTK_RESIZE_PARENT" name="Parent"/>
-      <member cname="GTK_RESIZE_QUEUE" name="Queue"/>
-      <member cname="GTK_RESIZE_IMMEDIATE" name="Immediate"/>
+      <member cname="GTK_RESIZE_PARENT" name="Parent" />
+      <member cname="GTK_RESIZE_QUEUE" name="Queue" />
+      <member cname="GTK_RESIZE_IMMEDIATE" name="Immediate" />
     </enum>
     <enum name="ResponseType" cname="GtkResponseType" type="enum">
-      <member cname="GTK_RESPONSE_NONE" name="None" value="-1"/>
-      <member cname="GTK_RESPONSE_REJECT" name="Reject" value="-2"/>
-      <member cname="GTK_RESPONSE_ACCEPT" name="Accept" value="-3"/>
-      <member cname="GTK_RESPONSE_DELETE_EVENT" name="DeleteEvent" value="-4"/>
-      <member cname="GTK_RESPONSE_OK" name="Ok" value="-5"/>
-      <member cname="GTK_RESPONSE_CANCEL" name="Cancel" value="-6"/>
-      <member cname="GTK_RESPONSE_CLOSE" name="Close" value="-7"/>
-      <member cname="GTK_RESPONSE_YES" name="Yes" value="-8"/>
-      <member cname="GTK_RESPONSE_NO" name="No" value="-9"/>
-      <member cname="GTK_RESPONSE_APPLY" name="Apply" value="-10"/>
-      <member cname="GTK_RESPONSE_HELP" name="Help" value="-11"/>
+      <member cname="GTK_RESPONSE_NONE" name="None" value="-1" />
+      <member cname="GTK_RESPONSE_REJECT" name="Reject" value="-2" />
+      <member cname="GTK_RESPONSE_ACCEPT" name="Accept" value="-3" />
+      <member cname="GTK_RESPONSE_DELETE_EVENT" name="DeleteEvent" value="-4" />
+      <member cname="GTK_RESPONSE_OK" name="Ok" value="-5" />
+      <member cname="GTK_RESPONSE_CANCEL" name="Cancel" value="-6" />
+      <member cname="GTK_RESPONSE_CLOSE" name="Close" value="-7" />
+      <member cname="GTK_RESPONSE_YES" name="Yes" value="-8" />
+      <member cname="GTK_RESPONSE_NO" name="No" value="-9" />
+      <member cname="GTK_RESPONSE_APPLY" name="Apply" value="-10" />
+      <member cname="GTK_RESPONSE_HELP" name="Help" value="-11" />
     </enum>
     <enum name="ScrollType" cname="GtkScrollType" type="enum">
-      <member cname="GTK_SCROLL_NONE" name="None"/>
-      <member cname="GTK_SCROLL_JUMP" name="Jump"/>
-      <member cname="GTK_SCROLL_STEP_BACKWARD" name="StepBackward"/>
-      <member cname="GTK_SCROLL_STEP_FORWARD" name="StepForward"/>
-      <member cname="GTK_SCROLL_PAGE_BACKWARD" name="PageBackward"/>
-      <member cname="GTK_SCROLL_PAGE_FORWARD" name="PageForward"/>
-      <member cname="GTK_SCROLL_STEP_UP" name="StepUp"/>
-      <member cname="GTK_SCROLL_STEP_DOWN" name="StepDown"/>
-      <member cname="GTK_SCROLL_PAGE_UP" name="PageUp"/>
-      <member cname="GTK_SCROLL_PAGE_DOWN" name="PageDown"/>
-      <member cname="GTK_SCROLL_STEP_LEFT" name="StepLeft"/>
-      <member cname="GTK_SCROLL_STEP_RIGHT" name="StepRight"/>
-      <member cname="GTK_SCROLL_PAGE_LEFT" name="PageLeft"/>
-      <member cname="GTK_SCROLL_PAGE_RIGHT" name="PageRight"/>
-      <member cname="GTK_SCROLL_START" name="Start"/>
-      <member cname="GTK_SCROLL_END" name="End"/>
+      <member cname="GTK_SCROLL_NONE" name="None" />
+      <member cname="GTK_SCROLL_JUMP" name="Jump" />
+      <member cname="GTK_SCROLL_STEP_BACKWARD" name="StepBackward" />
+      <member cname="GTK_SCROLL_STEP_FORWARD" name="StepForward" />
+      <member cname="GTK_SCROLL_PAGE_BACKWARD" name="PageBackward" />
+      <member cname="GTK_SCROLL_PAGE_FORWARD" name="PageForward" />
+      <member cname="GTK_SCROLL_STEP_UP" name="StepUp" />
+      <member cname="GTK_SCROLL_STEP_DOWN" name="StepDown" />
+      <member cname="GTK_SCROLL_PAGE_UP" name="PageUp" />
+      <member cname="GTK_SCROLL_PAGE_DOWN" name="PageDown" />
+      <member cname="GTK_SCROLL_STEP_LEFT" name="StepLeft" />
+      <member cname="GTK_SCROLL_STEP_RIGHT" name="StepRight" />
+      <member cname="GTK_SCROLL_PAGE_LEFT" name="PageLeft" />
+      <member cname="GTK_SCROLL_PAGE_RIGHT" name="PageRight" />
+      <member cname="GTK_SCROLL_START" name="Start" />
+      <member cname="GTK_SCROLL_END" name="End" />
     </enum>
     <enum name="SelectionMode" cname="GtkSelectionMode" type="enum">
-      <member cname="GTK_SELECTION_NONE" name="None"/>
-      <member cname="GTK_SELECTION_SINGLE" name="Single"/>
-      <member cname="GTK_SELECTION_BROWSE" name="Browse"/>
-      <member cname="GTK_SELECTION_MULTIPLE" name="Multiple"/>
-      <member cname="GTK_SELECTION_EXTENDED" name="Extended"/>
+      <member cname="GTK_SELECTION_NONE" name="None" />
+      <member cname="GTK_SELECTION_SINGLE" name="Single" />
+      <member cname="GTK_SELECTION_BROWSE" name="Browse" />
+      <member cname="GTK_SELECTION_MULTIPLE" name="Multiple" />
+      <member cname="GTK_SELECTION_EXTENDED" name="Extended" />
     </enum>
     <enum name="ShadowType" cname="GtkShadowType" type="enum">
-      <member cname="GTK_SHADOW_NONE" name="None"/>
-      <member cname="GTK_SHADOW_IN" name="In"/>
-      <member cname="GTK_SHADOW_OUT" name="Out"/>
-      <member cname="GTK_SHADOW_ETCHED_IN" name="EtchedIn"/>
-      <member cname="GTK_SHADOW_ETCHED_OUT" name="EtchedOut"/>
+      <member cname="GTK_SHADOW_NONE" name="None" />
+      <member cname="GTK_SHADOW_IN" name="In" />
+      <member cname="GTK_SHADOW_OUT" name="Out" />
+      <member cname="GTK_SHADOW_ETCHED_IN" name="EtchedIn" />
+      <member cname="GTK_SHADOW_ETCHED_OUT" name="EtchedOut" />
     </enum>
     <enum name="SizeGroupMode" cname="GtkSizeGroupMode" type="enum">
-      <member cname="GTK_SIZE_GROUP_NONE" name="None"/>
-      <member cname="GTK_SIZE_GROUP_HORIZONTAL" name="Horizontal"/>
-      <member cname="GTK_SIZE_GROUP_VERTICAL" name="Vertical"/>
-      <member cname="GTK_SIZE_GROUP_BOTH" name="Both"/>
+      <member cname="GTK_SIZE_GROUP_NONE" name="None" />
+      <member cname="GTK_SIZE_GROUP_HORIZONTAL" name="Horizontal" />
+      <member cname="GTK_SIZE_GROUP_VERTICAL" name="Vertical" />
+      <member cname="GTK_SIZE_GROUP_BOTH" name="Both" />
     </enum>
     <enum name="SortType" cname="GtkSortType" type="enum">
-      <member cname="GTK_SORT_ASCENDING" name="Ascending"/>
-      <member cname="GTK_SORT_DESCENDING" name="Descending"/>
+      <member cname="GTK_SORT_ASCENDING" name="Ascending" />
+      <member cname="GTK_SORT_DESCENDING" name="Descending" />
     </enum>
     <enum name="SpinButtonUpdatePolicy" cname="GtkSpinButtonUpdatePolicy" type="enum">
-      <member cname="GTK_UPDATE_ALWAYS" name="Always"/>
-      <member cname="GTK_UPDATE_IF_VALID" name="IfValid"/>
+      <member cname="GTK_UPDATE_ALWAYS" name="Always" />
+      <member cname="GTK_UPDATE_IF_VALID" name="IfValid" />
     </enum>
     <enum name="SpinType" cname="GtkSpinType" type="enum">
-      <member cname="GTK_SPIN_STEP_FORWARD" name="StepForward"/>
-      <member cname="GTK_SPIN_STEP_BACKWARD" name="StepBackward"/>
-      <member cname="GTK_SPIN_PAGE_FORWARD" name="PageForward"/>
-      <member cname="GTK_SPIN_PAGE_BACKWARD" name="PageBackward"/>
-      <member cname="GTK_SPIN_HOME" name="Home"/>
-      <member cname="GTK_SPIN_END" name="End"/>
-      <member cname="GTK_SPIN_USER_DEFINED" name="UserDefined"/>
+      <member cname="GTK_SPIN_STEP_FORWARD" name="StepForward" />
+      <member cname="GTK_SPIN_STEP_BACKWARD" name="StepBackward" />
+      <member cname="GTK_SPIN_PAGE_FORWARD" name="PageForward" />
+      <member cname="GTK_SPIN_PAGE_BACKWARD" name="PageBackward" />
+      <member cname="GTK_SPIN_HOME" name="Home" />
+      <member cname="GTK_SPIN_END" name="End" />
+      <member cname="GTK_SPIN_USER_DEFINED" name="UserDefined" />
     </enum>
     <enum name="StateType" cname="GtkStateType" type="enum">
-      <member cname="GTK_STATE_NORMAL" name="Normal"/>
-      <member cname="GTK_STATE_ACTIVE" name="Active"/>
-      <member cname="GTK_STATE_PRELIGHT" name="Prelight"/>
-      <member cname="GTK_STATE_SELECTED" name="Selected"/>
-      <member cname="GTK_STATE_INSENSITIVE" name="Insensitive"/>
+      <member cname="GTK_STATE_NORMAL" name="Normal" />
+      <member cname="GTK_STATE_ACTIVE" name="Active" />
+      <member cname="GTK_STATE_PRELIGHT" name="Prelight" />
+      <member cname="GTK_STATE_SELECTED" name="Selected" />
+      <member cname="GTK_STATE_INSENSITIVE" name="Insensitive" />
     </enum>
     <enum name="TargetFlags" cname="GtkTargetFlags" type="flags">
-      <member cname="GTK_TARGET_SAME_APP" name="App" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_TARGET_SAME_WIDGET" name="Widget" value="1 &lt;&lt; 1"/>
+      <member cname="GTK_TARGET_SAME_APP" name="App" value="1 &lt;&lt; 0" />
+      <member cname="GTK_TARGET_SAME_WIDGET" name="Widget" value="1 &lt;&lt; 1" />
     </enum>
     <enum name="TextDirection" cname="GtkTextDirection" type="enum">
-      <member cname="GTK_TEXT_DIR_NONE" name="None"/>
-      <member cname="GTK_TEXT_DIR_LTR" name="Ltr"/>
-      <member cname="GTK_TEXT_DIR_RTL" name="Rtl"/>
+      <member cname="GTK_TEXT_DIR_NONE" name="None" />
+      <member cname="GTK_TEXT_DIR_LTR" name="Ltr" />
+      <member cname="GTK_TEXT_DIR_RTL" name="Rtl" />
     </enum>
     <enum name="TextSearchFlags" cname="GtkTextSearchFlags" type="enum">
-      <member cname="GTK_TEXT_SEARCH_VISIBLE_ONLY" name="VisibleOnly"/>
-      <member cname="GTK_TEXT_SEARCH_TEXT_ONLY" name="TextOnly"/>
+      <member cname="GTK_TEXT_SEARCH_VISIBLE_ONLY" name="VisibleOnly" />
+      <member cname="GTK_TEXT_SEARCH_TEXT_ONLY" name="TextOnly" />
     </enum>
     <enum name="TextWindowType" cname="GtkTextWindowType" type="enum">
-      <member cname="GTK_TEXT_WINDOW_PRIVATE" name="Private"/>
-      <member cname="GTK_TEXT_WINDOW_WIDGET" name="Widget"/>
-      <member cname="GTK_TEXT_WINDOW_TEXT" name="Text"/>
-      <member cname="GTK_TEXT_WINDOW_LEFT" name="Left"/>
-      <member cname="GTK_TEXT_WINDOW_RIGHT" name="Right"/>
-      <member cname="GTK_TEXT_WINDOW_TOP" name="Top"/>
-      <member cname="GTK_TEXT_WINDOW_BOTTOM" name="Bottom"/>
+      <member cname="GTK_TEXT_WINDOW_PRIVATE" name="Private" />
+      <member cname="GTK_TEXT_WINDOW_WIDGET" name="Widget" />
+      <member cname="GTK_TEXT_WINDOW_TEXT" name="Text" />
+      <member cname="GTK_TEXT_WINDOW_LEFT" name="Left" />
+      <member cname="GTK_TEXT_WINDOW_RIGHT" name="Right" />
+      <member cname="GTK_TEXT_WINDOW_TOP" name="Top" />
+      <member cname="GTK_TEXT_WINDOW_BOTTOM" name="Bottom" />
     </enum>
     <enum name="ToolbarChildType" cname="GtkToolbarChildType" type="enum">
-      <member cname="GTK_TOOLBAR_CHILD_SPACE" name="Space"/>
-      <member cname="GTK_TOOLBAR_CHILD_BUTTON" name="Button"/>
-      <member cname="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" name="Togglebutton"/>
-      <member cname="GTK_TOOLBAR_CHILD_RADIOBUTTON" name="Radiobutton"/>
-      <member cname="GTK_TOOLBAR_CHILD_WIDGET" name="Widget"/>
+      <member cname="GTK_TOOLBAR_CHILD_SPACE" name="Space" />
+      <member cname="GTK_TOOLBAR_CHILD_BUTTON" name="Button" />
+      <member cname="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" name="Togglebutton" />
+      <member cname="GTK_TOOLBAR_CHILD_RADIOBUTTON" name="Radiobutton" />
+      <member cname="GTK_TOOLBAR_CHILD_WIDGET" name="Widget" />
     </enum>
     <enum name="ToolbarSpaceStyle" cname="GtkToolbarSpaceStyle" type="enum" hidden="1">
-      <member cname="GTK_TOOLBAR_SPACE_EMPTY" name="Empty"/>
-      <member cname="GTK_TOOLBAR_SPACE_LINE" name="Line"/>
+      <member cname="GTK_TOOLBAR_SPACE_EMPTY" name="Empty" />
+      <member cname="GTK_TOOLBAR_SPACE_LINE" name="Line" />
     </enum>
     <enum name="ToolbarStyle" cname="GtkToolbarStyle" type="enum">
-      <member cname="GTK_TOOLBAR_ICONS" name="Icons"/>
-      <member cname="GTK_TOOLBAR_TEXT" name="Text"/>
-      <member cname="GTK_TOOLBAR_BOTH" name="Both"/>
-      <member cname="GTK_TOOLBAR_BOTH_HORIZ" name="BothHoriz"/>
+      <member cname="GTK_TOOLBAR_ICONS" name="Icons" />
+      <member cname="GTK_TOOLBAR_TEXT" name="Text" />
+      <member cname="GTK_TOOLBAR_BOTH" name="Both" />
+      <member cname="GTK_TOOLBAR_BOTH_HORIZ" name="BothHoriz" />
     </enum>
     <enum name="TreeModelFlags" cname="GtkTreeModelFlags" type="flags">
-      <member cname="GTK_TREE_MODEL_ITERS_PERSIST" name="ItersPersist" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_TREE_MODEL_LIST_ONLY" name="ListOnly" value="1 &lt;&lt; 1"/>
+      <member cname="GTK_TREE_MODEL_ITERS_PERSIST" name="ItersPersist" value="1 &lt;&lt; 0" />
+      <member cname="GTK_TREE_MODEL_LIST_ONLY" name="ListOnly" value="1 &lt;&lt; 1" />
     </enum>
     <enum name="TreeViewColumnSizing" cname="GtkTreeViewColumnSizing" type="enum">
-      <member cname="GTK_TREE_VIEW_COLUMN_GROW_ONLY" name="GrowOnly"/>
-      <member cname="GTK_TREE_VIEW_COLUMN_AUTOSIZE" name="Autosize"/>
-      <member cname="GTK_TREE_VIEW_COLUMN_FIXED" name="Fixed"/>
+      <member cname="GTK_TREE_VIEW_COLUMN_GROW_ONLY" name="GrowOnly" />
+      <member cname="GTK_TREE_VIEW_COLUMN_AUTOSIZE" name="Autosize" />
+      <member cname="GTK_TREE_VIEW_COLUMN_FIXED" name="Fixed" />
     </enum>
     <enum name="TreeViewDropPosition" cname="GtkTreeViewDropPosition" type="enum">
-      <member cname="GTK_TREE_VIEW_DROP_BEFORE" name="Before"/>
-      <member cname="GTK_TREE_VIEW_DROP_AFTER" name="After"/>
-      <member cname="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" name="IntoOrBefore"/>
-      <member cname="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" name="IntoOrAfter"/>
+      <member cname="GTK_TREE_VIEW_DROP_BEFORE" name="Before" />
+      <member cname="GTK_TREE_VIEW_DROP_AFTER" name="After" />
+      <member cname="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" name="IntoOrBefore" />
+      <member cname="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" name="IntoOrAfter" />
     </enum>
     <enum name="UpdateType" cname="GtkUpdateType" type="enum">
-      <member cname="GTK_UPDATE_CONTINUOUS" name="Continuous"/>
-      <member cname="GTK_UPDATE_DISCONTINUOUS" name="Discontinuous"/>
-      <member cname="GTK_UPDATE_DELAYED" name="Delayed"/>
+      <member cname="GTK_UPDATE_CONTINUOUS" name="Continuous" />
+      <member cname="GTK_UPDATE_DISCONTINUOUS" name="Discontinuous" />
+      <member cname="GTK_UPDATE_DELAYED" name="Delayed" />
     </enum>
     <enum name="Visibility" cname="GtkVisibility" type="enum">
-      <member cname="GTK_VISIBILITY_NONE" name="None"/>
-      <member cname="GTK_VISIBILITY_PARTIAL" name="Partial"/>
-      <member cname="GTK_VISIBILITY_FULL" name="Full"/>
+      <member cname="GTK_VISIBILITY_NONE" name="None" />
+      <member cname="GTK_VISIBILITY_PARTIAL" name="Partial" />
+      <member cname="GTK_VISIBILITY_FULL" name="Full" />
     </enum>
     <enum name="WidgetFlags" cname="GtkWidgetFlags" type="flags" hidden="1">
-      <member cname="GTK_TOPLEVEL" name="Toplevel" value="1 &lt;&lt; 4"/>
-      <member cname="GTK_NO_WINDOW" name="NoWindow" value="1 &lt;&lt; 5"/>
-      <member cname="GTK_REALIZED" name="Realized" value="1 &lt;&lt; 6"/>
-      <member cname="GTK_MAPPED" name="Mapped" value="1 &lt;&lt; 7"/>
-      <member cname="GTK_VISIBLE" name="Visible" value="1 &lt;&lt; 8"/>
-      <member cname="GTK_SENSITIVE" name="Sensitive" value="1 &lt;&lt; 9"/>
-      <member cname="GTK_PARENT_SENSITIVE" name="ParentSensitive" value="1 &lt;&lt; 10"/>
-      <member cname="GTK_CAN_FOCUS" name="CanFocus" value="1 &lt;&lt; 11"/>
-      <member cname="GTK_HAS_FOCUS" name="HasFocus" value="1 &lt;&lt; 12"/>
-      <member cname="GTK_CAN_DEFAULT" name="CanDefault" value="1 &lt;&lt; 13"/>
-      <member cname="GTK_HAS_DEFAULT" name="HasDefault" value="1 &lt;&lt; 14"/>
-      <member cname="GTK_HAS_GRAB" name="HasGrab" value="1 &lt;&lt; 15"/>
-      <member cname="GTK_RC_STYLE" name="RcStyle" value="1 &lt;&lt; 16"/>
-      <member cname="GTK_COMPOSITE_CHILD" name="CompositeChild" value="1 &lt;&lt; 17"/>
-      <member cname="GTK_NO_REPARENT" name="NoReparent" value="1 &lt;&lt; 18"/>
-      <member cname="GTK_APP_PAINTABLE" name="AppPaintable" value="1 &lt;&lt; 19"/>
-      <member cname="GTK_RECEIVES_DEFAULT" name="ReceivesDefault" value="1 &lt;&lt; 20"/>
-      <member cname="GTK_DOUBLE_BUFFERED" name="DoubleBuffered" value="1 &lt;&lt; 21"/>
+      <member cname="GTK_TOPLEVEL" name="Toplevel" value="1 &lt;&lt; 4" />
+      <member cname="GTK_NO_WINDOW" name="NoWindow" value="1 &lt;&lt; 5" />
+      <member cname="GTK_REALIZED" name="Realized" value="1 &lt;&lt; 6" />
+      <member cname="GTK_MAPPED" name="Mapped" value="1 &lt;&lt; 7" />
+      <member cname="GTK_VISIBLE" name="Visible" value="1 &lt;&lt; 8" />
+      <member cname="GTK_SENSITIVE" name="Sensitive" value="1 &lt;&lt; 9" />
+      <member cname="GTK_PARENT_SENSITIVE" name="ParentSensitive" value="1 &lt;&lt; 10" />
+      <member cname="GTK_CAN_FOCUS" name="CanFocus" value="1 &lt;&lt; 11" />
+      <member cname="GTK_HAS_FOCUS" name="HasFocus" value="1 &lt;&lt; 12" />
+      <member cname="GTK_CAN_DEFAULT" name="CanDefault" value="1 &lt;&lt; 13" />
+      <member cname="GTK_HAS_DEFAULT" name="HasDefault" value="1 &lt;&lt; 14" />
+      <member cname="GTK_HAS_GRAB" name="HasGrab" value="1 &lt;&lt; 15" />
+      <member cname="GTK_RC_STYLE" name="RcStyle" value="1 &lt;&lt; 16" />
+      <member cname="GTK_COMPOSITE_CHILD" name="CompositeChild" value="1 &lt;&lt; 17" />
+      <member cname="GTK_NO_REPARENT" name="NoReparent" value="1 &lt;&lt; 18" />
+      <member cname="GTK_APP_PAINTABLE" name="AppPaintable" value="1 &lt;&lt; 19" />
+      <member cname="GTK_RECEIVES_DEFAULT" name="ReceivesDefault" value="1 &lt;&lt; 20" />
+      <member cname="GTK_DOUBLE_BUFFERED" name="DoubleBuffered" value="1 &lt;&lt; 21" />
     </enum>
     <enum name="WidgetHelpType" cname="GtkWidgetHelpType" type="enum">
-      <member cname="GTK_WIDGET_HELP_TOOLTIP" name="Tooltip"/>
-      <member cname="GTK_WIDGET_HELP_WHATS_THIS" name="WhatsThis"/>
+      <member cname="GTK_WIDGET_HELP_TOOLTIP" name="Tooltip" />
+      <member cname="GTK_WIDGET_HELP_WHATS_THIS" name="WhatsThis" />
     </enum>
     <enum name="WindowPosition" cname="GtkWindowPosition" type="enum">
-      <member cname="GTK_WIN_POS_NONE" name="None"/>
-      <member cname="GTK_WIN_POS_CENTER" name="Center"/>
-      <member cname="GTK_WIN_POS_MOUSE" name="Mouse"/>
-      <member cname="GTK_WIN_POS_CENTER_ALWAYS" name="CenterAlways"/>
-      <member cname="GTK_WIN_POS_CENTER_ON_PARENT" name="CenterOnParent"/>
+      <member cname="GTK_WIN_POS_NONE" name="None" />
+      <member cname="GTK_WIN_POS_CENTER" name="Center" />
+      <member cname="GTK_WIN_POS_MOUSE" name="Mouse" />
+      <member cname="GTK_WIN_POS_CENTER_ALWAYS" name="CenterAlways" />
+      <member cname="GTK_WIN_POS_CENTER_ON_PARENT" name="CenterOnParent" />
     </enum>
     <enum name="WindowType" cname="GtkWindowType" type="enum">
-      <member cname="GTK_WINDOW_TOPLEVEL" name="Toplevel"/>
-      <member cname="GTK_WINDOW_POPUP" name="Popup"/>
+      <member cname="GTK_WINDOW_TOPLEVEL" name="Toplevel" />
+      <member cname="GTK_WINDOW_POPUP" name="Popup" />
     </enum>
     <enum name="WrapMode" cname="GtkWrapMode" type="enum">
-      <member cname="GTK_WRAP_NONE" name="None"/>
-      <member cname="GTK_WRAP_CHAR" name="Char"/>
-      <member cname="GTK_WRAP_WORD" name="Word"/>
+      <member cname="GTK_WRAP_NONE" name="None" />
+      <member cname="GTK_WRAP_CHAR" name="Char" />
+      <member cname="GTK_WRAP_WORD" name="Word" />
     </enum>
     <callback name="AccelGroupActivate" cname="GtkAccelGroupActivate">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkAccelGroup*" name="accel_group"/>
-        <parameter type="GObject*" name="acceleratable"/>
-        <parameter type="guint" name="keyval"/>
-        <parameter type="GdkModifierType" name="modifier"/>
+        <parameter type="GtkAccelGroup*" name="accel_group" />
+        <parameter type="GObject*" name="acceleratable" />
+        <parameter type="guint" name="keyval" />
+        <parameter type="GdkModifierType" name="modifier" />
       </parameters>
     </callback>
     <callback name="AccelGroupFindFunc" cname="GtkAccelGroupFindFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkAccelKey*" name="key"/>
-        <parameter type="GClosure*" name="closure"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkAccelKey*" name="key" />
+        <parameter type="GClosure*" name="closure" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="AccelMapForeach" cname="GtkAccelMapForeach">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gpointer" name="data"/>
-        <parameter type="const-gchar*" name="accel_path"/>
-        <parameter type="guint" name="accel_key"/>
-        <parameter type="GdkModifierType" name="accel_mods"/>
-        <parameter type="gboolean" name="changed"/>
+        <parameter type="gpointer" name="data" />
+        <parameter type="const-gchar*" name="accel_path" />
+        <parameter type="guint" name="accel_key" />
+        <parameter type="GdkModifierType" name="accel_mods" />
+        <parameter type="gboolean" name="changed" />
       </parameters>
     </callback>
     <callback name="Callback" cname="GtkCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkWidget*" name="widget"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkWidget*" name="widget" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="CallbackMarshal" cname="GtkCallbackMarshal">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkObject*" name="object"/>
-        <parameter type="gpointer" name="data"/>
-        <parameter type="guint" name="n_args"/>
-        <parameter type="GtkArg*" name="args"/>
+        <parameter type="GtkObject*" name="object" />
+        <parameter type="gpointer" name="data" />
+        <parameter type="guint" name="n_args" />
+        <parameter type="GtkArg*" name="args" />
       </parameters>
     </callback>
     <callback name="ClipboardClearFunc" cname="GtkClipboardClearFunc" hidden="1">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkClipboard*" name="clipboard"/>
-        <parameter type="gpointer" name="user_data_or_owner"/>
+        <parameter type="GtkClipboard*" name="clipboard" />
+        <parameter type="gpointer" name="user_data_or_owner" />
       </parameters>
     </callback>
     <callback name="ClipboardGetFunc" cname="GtkClipboardGetFunc" hidden="1">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkClipboard*" name="clipboard"/>
-        <parameter type="GtkSelectionData*" name="selection_data"/>
-        <parameter type="guint" name="info"/>
-        <parameter type="gpointer" name="user_data_or_owner"/>
+        <parameter type="GtkClipboard*" name="clipboard" />
+        <parameter type="GtkSelectionData*" name="selection_data" />
+        <parameter type="guint" name="info" />
+        <parameter type="gpointer" name="user_data_or_owner" />
       </parameters>
     </callback>
     <callback name="ClipboardReceivedFunc" cname="GtkClipboardReceivedFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkClipboard*" name="clipboard"/>
-        <parameter type="GtkSelectionData*" name="selection_data"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkClipboard*" name="clipboard" />
+        <parameter type="GtkSelectionData*" name="selection_data" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ClipboardTextReceivedFunc" cname="GtkClipboardTextReceivedFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkClipboard*" name="clipboard"/>
-        <parameter type="const-gchar*" name="text"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkClipboard*" name="clipboard" />
+        <parameter type="const-gchar*" name="text" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ColorSelectionChangePaletteFunc" cname="GtkColorSelectionChangePaletteFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="const-GdkColor*" name="colors"/>
-        <parameter type="gint" name="n_colors"/>
+        <parameter type="const-GdkColor*" name="colors" />
+        <parameter type="gint" name="n_colors" />
       </parameters>
     </callback>
     <callback name="ColorSelectionChangePaletteWithScreenFunc" cname="GtkColorSelectionChangePaletteWithScreenFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GdkScreen*" name="screen"/>
-        <parameter type="const-GdkColor*" name="colors"/>
-        <parameter type="gint" name="n_colors"/>
+        <parameter type="GdkScreen*" name="screen" />
+        <parameter type="const-GdkColor*" name="colors" />
+        <parameter type="gint" name="n_colors" />
       </parameters>
     </callback>
     <callback name="DestroyNotify" cname="GtkDestroyNotify">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="Function" cname="GtkFunction">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="ItemFactoryCallback" cname="GtkItemFactoryCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
     </callback>
     <callback name="ItemFactoryCallback1" cname="GtkItemFactoryCallback1">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gpointer" name="callback_data"/>
-        <parameter type="guint" name="callback_action"/>
-        <parameter type="GtkWidget*" name="widget"/>
+        <parameter type="gpointer" name="callback_data" />
+        <parameter type="guint" name="callback_action" />
+        <parameter type="GtkWidget*" name="widget" />
       </parameters>
     </callback>
     <callback name="KeySnoopFunc" cname="GtkKeySnoopFunc">
-      <return-type type="gint"/>
+      <return-type type="gint" />
       <parameters>
-        <parameter type="GtkWidget*" name="grab_widget"/>
-        <parameter type="GdkEventKey*" name="event"/>
-        <parameter type="gpointer" name="func_data"/>
+        <parameter type="GtkWidget*" name="grab_widget" />
+        <parameter type="GdkEventKey*" name="event" />
+        <parameter type="gpointer" name="func_data" />
       </parameters>
     </callback>
     <callback name="MenuDetachFunc" cname="GtkMenuDetachFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkWidget*" name="attach_widget"/>
-        <parameter type="GtkMenu*" name="menu"/>
+        <parameter type="GtkWidget*" name="attach_widget" />
+        <parameter type="GtkMenu*" name="menu" />
       </parameters>
     </callback>
     <callback name="MenuPositionFunc" cname="GtkMenuPositionFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkMenu*" name="menu"/>
-        <parameter type="gint*" name="x"/>
-        <parameter type="gint*" name="y"/>
-        <parameter type="gboolean*" name="push_in"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkMenu*" name="menu" />
+        <parameter type="gint*" name="x" />
+        <parameter type="gint*" name="y" />
+        <parameter type="gboolean*" name="push_in" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="ModuleDisplayInitFunc" cname="GtkModuleDisplayInitFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GdkDisplay*" name="display"/>
+        <parameter type="GdkDisplay*" name="display" />
       </parameters>
     </callback>
     <callback name="ModuleInitFunc" cname="GtkModuleInitFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gint*" name="argc"/>
-        <parameter type="gchar***" name="argv"/>
+        <parameter type="gint*" name="argc" />
+        <parameter type="gchar***" name="argv" />
       </parameters>
     </callback>
     <callback name="PrintFunc" cname="GtkPrintFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="gpointer" name="func_data"/>
-        <parameter type="const-gchar*" name="str"/>
+        <parameter type="gpointer" name="func_data" />
+        <parameter type="const-gchar*" name="str" />
       </parameters>
     </callback>
     <callback name="RBTreeTraverseFunc" cname="GtkRBTreeTraverseFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkRBTree*" name="tree"/>
-        <parameter type="GtkRBNode*" name="node"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkRBTree*" name="tree" />
+        <parameter type="GtkRBNode*" name="node" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="RcPropertyParser" cname="GtkRcPropertyParser">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="const-GParamSpec*" name="pspec"/>
-        <parameter type="const-GString*" name="rc_string"/>
-        <parameter type="GValue*" name="property_value"/>
+        <parameter type="const-GParamSpec*" name="pspec" />
+        <parameter type="const-GString*" name="rc_string" />
+        <parameter type="GValue*" name="property_value" />
       </parameters>
     </callback>
     <callback name="SignalFunc" cname="GtkSignalFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
     </callback>
     <callback name="TextCharPredicate" cname="GtkTextCharPredicate">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="gunichar" name="ch"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="gunichar" name="ch" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="TextSegCheckFunc" cname="GtkTextSegCheckFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTextLineSegment*" name="seg"/>
-        <parameter type="GtkTextLine*" name="line"/>
+        <parameter type="GtkTextLineSegment*" name="seg" />
+        <parameter type="GtkTextLine*" name="line" />
       </parameters>
     </callback>
     <callback name="TextSegCleanupFunc" cname="GtkTextSegCleanupFunc">
-      <return-type type="GtkTextLineSegment*"/>
+      <return-type type="GtkTextLineSegment*" />
       <parameters>
-        <parameter type="GtkTextLineSegment*" name="seg"/>
-        <parameter type="GtkTextLine*" name="line"/>
+        <parameter type="GtkTextLineSegment*" name="seg" />
+        <parameter type="GtkTextLine*" name="line" />
       </parameters>
     </callback>
     <callback name="TextSegDeleteFunc" cname="GtkTextSegDeleteFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkTextLineSegment*" name="seg"/>
-        <parameter type="GtkTextLine*" name="line"/>
-        <parameter type="gboolean" name="tree_gone"/>
+        <parameter type="GtkTextLineSegment*" name="seg" />
+        <parameter type="GtkTextLine*" name="line" />
+        <parameter type="gboolean" name="tree_gone" />
       </parameters>
     </callback>
     <callback name="TextSegLineChangeFunc" cname="GtkTextSegLineChangeFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTextLineSegment*" name="seg"/>
-        <parameter type="GtkTextLine*" name="line"/>
+        <parameter type="GtkTextLineSegment*" name="seg" />
+        <parameter type="GtkTextLine*" name="line" />
       </parameters>
     </callback>
     <callback name="TextSegSplitFunc" cname="GtkTextSegSplitFunc">
-      <return-type type="GtkTextLineSegment*"/>
+      <return-type type="GtkTextLineSegment*" />
       <parameters>
-        <parameter type="GtkTextLineSegment*" name="seg"/>
-        <parameter type="gint" name="index"/>
+        <parameter type="GtkTextLineSegment*" name="seg" />
+        <parameter type="gint" name="index" />
       </parameters>
     </callback>
     <callback name="TextTagTableForeach" cname="GtkTextTagTableForeach">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTextTag*" name="tag"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTextTag*" name="tag" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TextUtilCharChosenFunc" cname="GtkTextUtilCharChosenFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="const-char*" name="text"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="const-char*" name="text" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TranslateFunc" cname="GtkTranslateFunc">
-      <return-type type="gchar*"/>
+      <return-type type="gchar*" />
       <parameters>
-        <parameter type="const-gchar*" name="path"/>
-        <parameter type="gpointer" name="func_data"/>
+        <parameter type="const-gchar*" name="path" />
+        <parameter type="gpointer" name="func_data" />
       </parameters>
     </callback>
     <callback name="TreeCellDataFunc" cname="GtkTreeCellDataFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTreeViewColumn*" name="tree_column"/>
-        <parameter type="GtkCellRenderer*" name="cell"/>
-        <parameter type="GtkTreeModel*" name="tree_model"/>
-        <parameter type="GtkTreeIter*" name="iter"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTreeViewColumn*" name="tree_column" />
+        <parameter type="GtkCellRenderer*" name="cell" />
+        <parameter type="GtkTreeModel*" name="tree_model" />
+        <parameter type="GtkTreeIter*" name="iter" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TreeDestroyCountFunc" cname="GtkTreeDestroyCountFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTreeView*" name="tree_view"/>
-        <parameter type="GtkTreePath*" name="path"/>
-        <parameter type="gint" name="children"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkTreeView*" name="tree_view" />
+        <parameter type="GtkTreePath*" name="path" />
+        <parameter type="gint" name="children" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="TreeIterCompareFunc" cname="GtkTreeIterCompareFunc">
-      <return-type type="gint"/>
+      <return-type type="gint" />
       <parameters>
-        <parameter type="GtkTreeModel*" name="model"/>
-        <parameter type="GtkTreeIter*" name="a"/>
-        <parameter type="GtkTreeIter*" name="b"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkTreeModel*" name="model" />
+        <parameter type="GtkTreeIter*" name="a" />
+        <parameter type="GtkTreeIter*" name="b" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="TreeModelForeachFunc" cname="GtkTreeModelForeachFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkTreeModel*" name="model"/>
-        <parameter type="GtkTreePath*" name="path"/>
-        <parameter type="GtkTreeIter*" name="iter"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTreeModel*" name="model" />
+        <parameter type="GtkTreePath*" name="path" />
+        <parameter type="GtkTreeIter*" name="iter" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TreeSelectionForeachFunc" cname="GtkTreeSelectionForeachFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTreeModel*" name="model"/>
-        <parameter type="GtkTreePath*" name="path"/>
-        <parameter type="GtkTreeIter*" name="iter"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTreeModel*" name="model" />
+        <parameter type="GtkTreePath*" name="path" />
+        <parameter type="GtkTreeIter*" name="iter" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TreeSelectionFunc" cname="GtkTreeSelectionFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkTreeSelection*" name="selection"/>
-        <parameter type="GtkTreeModel*" name="model"/>
-        <parameter type="GtkTreePath*" name="path"/>
-        <parameter type="gboolean" name="path_currently_selected"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTreeSelection*" name="selection" />
+        <parameter type="GtkTreeModel*" name="model" />
+        <parameter type="GtkTreePath*" name="path" />
+        <parameter type="gboolean" name="path_currently_selected" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TreeViewColumnDropFunc" cname="GtkTreeViewColumnDropFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkTreeView*" name="tree_view"/>
-        <parameter type="GtkTreeViewColumn*" name="column"/>
-        <parameter type="GtkTreeViewColumn*" name="prev_column"/>
-        <parameter type="GtkTreeViewColumn*" name="next_column"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkTreeView*" name="tree_view" />
+        <parameter type="GtkTreeViewColumn*" name="column" />
+        <parameter type="GtkTreeViewColumn*" name="prev_column" />
+        <parameter type="GtkTreeViewColumn*" name="next_column" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <callback name="TreeViewMappingFunc" cname="GtkTreeViewMappingFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkTreeView*" name="tree_view"/>
-        <parameter type="GtkTreePath*" name="path"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkTreeView*" name="tree_view" />
+        <parameter type="GtkTreePath*" name="path" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="TreeViewSearchEqualFunc" cname="GtkTreeViewSearchEqualFunc">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="GtkTreeModel*" name="model"/>
-        <parameter type="gint" name="column"/>
-        <parameter type="const-gchar*" name="key"/>
-        <parameter type="GtkTreeIter*" name="iter"/>
-        <parameter type="gpointer" name="search_data"/>
+        <parameter type="GtkTreeModel*" name="model" />
+        <parameter type="gint" name="column" />
+        <parameter type="const-gchar*" name="key" />
+        <parameter type="GtkTreeIter*" name="iter" />
+        <parameter type="gpointer" name="search_data" />
       </parameters>
     </callback>
     <callback name="WindowKeysForeachFunc" cname="GtkWindowKeysForeachFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkWindow*" name="window"/>
-        <parameter type="guint" name="keyval"/>
-        <parameter type="GdkModifierType" name="modifiers"/>
-        <parameter type="gboolean" name="is_mnemonic"/>
-        <parameter type="gpointer" name="data"/>
+        <parameter type="GtkWindow*" name="window" />
+        <parameter type="guint" name="keyval" />
+        <parameter type="GdkModifierType" name="modifiers" />
+        <parameter type="gboolean" name="is_mnemonic" />
+        <parameter type="gpointer" name="data" />
       </parameters>
     </callback>
     <interface name="CellEditable" cname="GtkCellEditable">
       <signal name="EditingDone" cname="editing_done" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellEditable*" name="cell_editable"/>
+          <parameter type="GtkCellEditable*" name="cell_editable" />
         </parameters>
       </signal>
       <signal name="WidgetRemoved" cname="remove_widget" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellEditable*" name="cell_editable"/>
+          <parameter type="GtkCellEditable*" name="cell_editable" />
         </parameters>
       </signal>
       <method name="FinishEditing" cname="gtk_cell_editable_editing_done">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_cell_editable_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="RemoveWidget" cname="gtk_cell_editable_remove_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="StartEditing" cname="gtk_cell_editable_start_editing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
     </interface>
     <interface name="Editable" cname="GtkEditable">
       <signal name="TextInserted" cname="insert_text" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEditable*" name="editable"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="length"/>
-          <parameter type="gint*" name="position"/>
+          <parameter type="GtkEditable*" name="editable" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="length" />
+          <parameter type="gint*" name="position" />
         </parameters>
       </signal>
       <signal name="TextDeleted" cname="delete_text" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEditable*" name="editable"/>
-          <parameter type="gint" name="start_pos"/>
-          <parameter type="gint" name="end_pos"/>
+          <parameter type="GtkEditable*" name="editable" />
+          <parameter type="gint" name="start_pos" />
+          <parameter type="gint" name="end_pos" />
         </parameters>
       </signal>
       <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEditable*" name="editable"/>
+          <parameter type="GtkEditable*" name="editable" />
         </parameters>
       </signal>
       <method name="CopyClipboard" cname="gtk_editable_copy_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="CutClipboard" cname="gtk_editable_cut_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="DeleteSelection" cname="gtk_editable_delete_selection">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="DeleteText" cname="gtk_editable_delete_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="start_pos"/>
-          <parameter type="gint" name="end_pos"/>
+          <parameter type="gint" name="start_pos" />
+          <parameter type="gint" name="end_pos" />
         </parameters>
       </method>
       <method name="GetChars" cname="gtk_editable_get_chars">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="gint" name="start_pos"/>
-          <parameter type="gint" name="end_pos"/>
+          <parameter type="gint" name="start_pos" />
+          <parameter type="gint" name="end_pos" />
         </parameters>
       </method>
       <method name="GetIsEditable" cname="gtk_editable_get_editable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetPosition" cname="gtk_editable_get_position">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetSelectionBounds" cname="gtk_editable_get_selection_bounds">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint*" name="start"/>
-          <parameter type="gint*" name="end"/>
+          <parameter type="gint*" name="start" />
+          <parameter type="gint*" name="end" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_editable_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="InsertText" cname="gtk_editable_insert_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="new_text"/>
-          <parameter type="gint" name="new_text_length"/>
-          <parameter type="gint*" name="position" pass_as="ref"/>
+          <parameter type="const-gchar*" name="new_text" />
+          <parameter type="gint" name="new_text_length" />
+          <parameter type="gint*" name="position" pass_as="ref" />
         </parameters>
       </method>
       <method name="PasteClipboard" cname="gtk_editable_paste_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectRegion" cname="gtk_editable_select_region">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="end"/>
+          <parameter type="gint" name="start" />
+          <parameter type="gint" name="end" />
         </parameters>
       </method>
       <method name="SetIsEditable" cname="gtk_editable_set_editable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="is_editable"/>
+          <parameter type="gboolean" name="is_editable" />
         </parameters>
       </method>
       <method name="SetPosition" cname="gtk_editable_set_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="position"/>
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
     </interface>
     <interface name="TreeDragDest" cname="GtkTreeDragDest">
       <method name="DragDataReceived" cname="gtk_tree_drag_dest_drag_data_received">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="dest"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
+          <parameter type="GtkTreePath*" name="dest" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_tree_drag_dest_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="RowDropPossible" cname="gtk_tree_drag_dest_row_drop_possible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="dest_path"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
+          <parameter type="GtkTreePath*" name="dest_path" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
         </parameters>
       </method>
     </interface>
     <interface name="TreeDragSource" cname="GtkTreeDragSource">
       <method name="DragDataDelete" cname="gtk_tree_drag_source_drag_data_delete">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="DragDataGet" cname="gtk_tree_drag_source_drag_data_get">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_tree_drag_source_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="RowDraggable" cname="gtk_tree_drag_source_row_draggable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
     </interface>
     <interface name="TreeModel" cname="GtkTreeModel">
       <signal name="RowChanged" cname="row_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
       <signal name="RowInserted" cname="row_inserted" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
       <signal name="RowHasChildToggled" cname="row_has_child_toggled" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
       <signal name="RowDeleted" cname="row_deleted" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
       <signal name="RowsReordered" cname="rows_reordered" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint*" name="new_order"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint*" name="new_order" />
         </parameters>
       </signal>
       <method name="Foreach" cname="gtk_tree_model_foreach">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModelForeachFunc" name="func"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkTreeModelForeachFunc" name="func" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="Get" cname="gtk_tree_model_get">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="GetColumnType" cname="gtk_tree_model_get_column_type">
-        <return-type type="GType"/>
+        <return-type type="GType" />
         <parameters>
-          <parameter type="gint" name="index_"/>
+          <parameter type="gint" name="index_" />
         </parameters>
       </method>
       <method name="GetFlags" cname="gtk_tree_model_get_flags">
-        <return-type type="GtkTreeModelFlags"/>
+        <return-type type="GtkTreeModelFlags" />
       </method>
       <method name="GetIter" cname="gtk_tree_model_get_iter">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="GetIterFirst" cname="gtk_tree_model_get_iter_first">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="const-gchar*" name="path_string"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="const-gchar*" name="path_string" />
         </parameters>
       </method>
       <method name="GetNColumns" cname="gtk_tree_model_get_n_columns">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPath" cname="gtk_tree_model_get_path">
-        <return-type type="GtkTreePath*"/>
+        <return-type type="GtkTreePath*" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="GetStringFromIter" cname="gtk_tree_model_get_string_from_iter">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_tree_model_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetValist" cname="gtk_tree_model_get_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="GetValue" cname="gtk_tree_model_get_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GValue*" name="value"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint" name="column" />
+          <parameter type="GValue*" name="value" />
         </parameters>
       </method>
       <method name="IterChildren" cname="gtk_tree_model_iter_children">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
         </parameters>
       </method>
       <method name="IterHasChild" cname="gtk_tree_model_iter_has_child">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="IterNChildren" cname="gtk_tree_model_iter_n_children">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="IterNext" cname="gtk_tree_model_iter_next">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="IterNthChild" cname="gtk_tree_model_iter_nth_child">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="gint" name="n"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
+          <parameter type="gint" name="n" />
         </parameters>
       </method>
       <method name="IterParent" cname="gtk_tree_model_iter_parent">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="child"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="child" />
         </parameters>
       </method>
       <method name="RefNode" cname="gtk_tree_model_ref_node">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="EmitRowChanged" cname="gtk_tree_model_row_changed">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="EmitRowDeleted" cname="gtk_tree_model_row_deleted">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="EmitRowHasChildToggled" cname="gtk_tree_model_row_has_child_toggled">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="EmitRowInserted" cname="gtk_tree_model_row_inserted">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="EmitRowsReordered" cname="gtk_tree_model_rows_reordered">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint*" name="new_order"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint*" name="new_order" />
         </parameters>
       </method>
       <method name="UnrefNode" cname="gtk_tree_model_unref_node">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
     </interface>
     <interface name="TreeSortable" cname="GtkTreeSortable">
       <signal name="SortColumnChanged" cname="sort_column_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeSortable*" name="sortable"/>
+          <parameter type="GtkTreeSortable*" name="sortable" />
         </parameters>
       </signal>
       <method name="GetSortColumnId" cname="gtk_tree_sortable_get_sort_column_id">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint*" name="sort_column_id"/>
-          <parameter type="GtkSortType*" name="order"/>
+          <parameter type="gint*" name="sort_column_id" />
+          <parameter type="GtkSortType*" name="order" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_tree_sortable_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="HasDefaultSortFunc" cname="gtk_tree_sortable_has_default_sort_func">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="SetDefaultSortFunc" cname="gtk_tree_sortable_set_default_sort_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIterCompareFunc" name="sort_func"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GtkTreeIterCompareFunc" name="sort_func" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="SetSortColumnId" cname="gtk_tree_sortable_set_sort_column_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="sort_column_id"/>
-          <parameter type="GtkSortType" name="order"/>
+          <parameter type="gint" name="sort_column_id" />
+          <parameter type="GtkSortType" name="order" />
         </parameters>
       </method>
       <method name="SetSortFunc" cname="gtk_tree_sortable_set_sort_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="sort_column_id"/>
-          <parameter type="GtkTreeIterCompareFunc" name="sort_func"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="gint" name="sort_column_id" />
+          <parameter type="GtkTreeIterCompareFunc" name="sort_func" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="ChangeSortColumn" cname="gtk_tree_sortable_sort_column_changed">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </interface>
     <object name="AccelGroup" cname="GtkAccelGroup" parent="GObject">
-      <field cname="lock_count" type="guint"/>
-      <field cname="modifier_mask" type="GdkModifierType"/>
-      <field cname="acceleratables" type="GSList*"/>
-      <field cname="n_accels" type="guint"/>
-      <field cname="priv_accels" type="GtkAccelGroupEntry*"/>
+      <field cname="lock_count" type="guint" />
+      <field cname="modifier_mask" type="GdkModifierType" />
+      <field cname="acceleratables" type="GSList*" />
+      <field cname="n_accels" type="guint" />
+      <field cname="priv_accels" type="GtkAccelGroupEntry*" />
       <signal name="AccelActivate" cname="accel_activate">
-        <return-type type="GBoolean"/>
+        <return-type type="GBoolean" />
         <parameters>
-          <parameter name="p0" type="GObject"/>
+          <parameter name="p0" type="GObject" />
         </parameters>
       </signal>
       <signal name="AccelChanged" cname="accel_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifier"/>
-          <parameter type="GClosure*" name="accel_closure"/>
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifier" />
+          <parameter type="GClosure*" name="accel_closure" />
         </parameters>
       </signal>
       <method name="Connect" cname="gtk_accel_group_connect">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
-          <parameter type="GtkAccelFlags" name="accel_flags"/>
-          <parameter type="GClosure*" name="closure"/>
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
+          <parameter type="GtkAccelFlags" name="accel_flags" />
+          <parameter type="GClosure*" name="closure" />
         </parameters>
       </method>
       <method name="ConnectByPath" cname="gtk_accel_group_connect_by_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
-          <parameter type="GClosure*" name="closure"/>
+          <parameter type="const-gchar*" name="accel_path" />
+          <parameter type="GClosure*" name="closure" />
         </parameters>
       </method>
       <method name="Disconnect" cname="gtk_accel_group_disconnect">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GClosure*" name="closure"/>
+          <parameter type="GClosure*" name="closure" />
         </parameters>
       </method>
       <method name="DisconnectKey" cname="gtk_accel_group_disconnect_key">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
         </parameters>
       </method>
       <method name="Find" cname="gtk_accel_group_find">
-        <return-type type="GtkAccelKey*"/>
+        <return-type type="GtkAccelKey*" />
         <parameters>
-          <parameter type="GtkAccelGroupFindFunc" name="find_func"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkAccelGroupFindFunc" name="find_func" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="FromAccelClosure" cname="gtk_accel_group_from_accel_closure" shared="true">
-        <return-type type="GtkAccelGroup*"/>
+        <return-type type="GtkAccelGroup*" />
         <parameters>
-          <parameter type="GClosure*" name="closure"/>
+          <parameter type="GClosure*" name="closure" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_accel_group_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Lock" cname="gtk_accel_group_lock">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
-      <constructor cname="gtk_accel_group_new"/>
+      <constructor cname="gtk_accel_group_new" />
       <method name="Query" cname="gtk_accel_group_query">
-        <return-type type="GtkAccelGroupEntry*"/>
+        <return-type type="GtkAccelGroupEntry*" />
         <parameters>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
-          <parameter type="guint*" name="n_entries"/>
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
+          <parameter type="guint*" name="n_entries" />
         </parameters>
       </method>
       <method name="Unlock" cname="gtk_accel_group_unlock">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="AccelLabel" cname="GtkAccelLabel" parent="GtkLabel">
-      <field cname="gtk_reserved" type="guint"/>
-      <field cname="accel_padding" type="guint"/>
-      <field cname="accel_widget" type="GtkWidget*"/>
-      <field cname="accel_closure" type="GClosure*"/>
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="accel_string" type="gchar*"/>
-      <field cname="accel_string_width" type="guint16"/>
-      <property name="AccelClosure" cname="accel_closure" type="GClosure" readable="true" writeable="true"/>
-      <property name="AccelWidget" cname="accel_widget" type="GtkWidget" readable="true" writeable="true"/>
+      <field cname="gtk_reserved" type="guint" />
+      <field cname="accel_padding" type="guint" />
+      <field cname="accel_widget" type="GtkWidget*" />
+      <field cname="accel_closure" type="GClosure*" />
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="accel_string" type="gchar*" />
+      <field cname="accel_string_width" type="guint16" />
+      <property name="AccelClosure" cname="accel_closure" type="GClosure" readable="true" writeable="true" />
+      <property name="AccelWidget" cname="accel_widget" type="GtkWidget" readable="true" writeable="true" />
       <method name="GetAccelWidget" cname="gtk_accel_label_get_accel_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetAccelWidth" cname="gtk_accel_label_get_accel_width">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetType" cname="gtk_accel_label_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_accel_label_new">
         <parameters>
-          <parameter type="const-gchar*" name="string"/>
+          <parameter type="const-gchar*" name="string" />
         </parameters>
       </constructor>
       <method name="Refetch" cname="gtk_accel_label_refetch">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="SetAccelClosure" cname="gtk_accel_label_set_accel_closure">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GClosure*" name="accel_closure"/>
+          <parameter type="GClosure*" name="accel_closure" />
         </parameters>
       </method>
       <method name="SetAccelWidget" cname="gtk_accel_label_set_accel_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="accel_widget"/>
+          <parameter type="GtkWidget*" name="accel_widget" />
         </parameters>
       </method>
     </object>
     <object name="Accessible" cname="GtkAccessible" parent="AtkObject">
-      <field cname="widget" type="GtkWidget*"/>
+      <field cname="widget" type="GtkWidget*" />
       <method name="ConnectWidgetDestroyed" cname="gtk_accessible_connect_widget_destroyed">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_accessible_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="Adjustment" cname="GtkAdjustment" parent="GtkObject">
-      <field cname="lower" type="gdouble"/>
-      <field cname="upper" type="gdouble"/>
-      <field cname="value" type="gdouble"/>
-      <field cname="step_increment" type="gdouble"/>
-      <field cname="page_increment" type="gdouble"/>
-      <field cname="page_size" type="gdouble"/>
+      <field cname="lower" type="gdouble" />
+      <field cname="upper" type="gdouble" />
+      <field cname="value" type="gdouble" />
+      <field cname="step_increment" type="gdouble" />
+      <field cname="page_increment" type="gdouble" />
+      <field cname="page_size" type="gdouble" />
       <signal name="Changed" cname="changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </signal>
       <signal name="ValueChanged" cname="value_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </signal>
       <method name="Change" cname="gtk_adjustment_changed">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ClampPage" cname="gtk_adjustment_clamp_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="lower"/>
-          <parameter type="gdouble" name="upper"/>
+          <parameter type="gdouble" name="lower" />
+          <parameter type="gdouble" name="upper" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_adjustment_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetValue" cname="gtk_adjustment_get_value">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <constructor cname="gtk_adjustment_new">
         <parameters>
-          <parameter type="gdouble" name="value"/>
-          <parameter type="gdouble" name="lower"/>
-          <parameter type="gdouble" name="upper"/>
-          <parameter type="gdouble" name="step_increment"/>
-          <parameter type="gdouble" name="page_increment"/>
-          <parameter type="gdouble" name="page_size"/>
+          <parameter type="gdouble" name="value" />
+          <parameter type="gdouble" name="lower" />
+          <parameter type="gdouble" name="upper" />
+          <parameter type="gdouble" name="step_increment" />
+          <parameter type="gdouble" name="page_increment" />
+          <parameter type="gdouble" name="page_size" />
         </parameters>
       </constructor>
       <method name="SetValue" cname="gtk_adjustment_set_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="value"/>
+          <parameter type="gdouble" name="value" />
         </parameters>
       </method>
       <method name="ChangeValue" cname="gtk_adjustment_value_changed">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Alignment" cname="GtkAlignment" parent="GtkBin">
-      <field cname="xalign" type="gfloat"/>
-      <field cname="yalign" type="gfloat"/>
-      <field cname="xscale" type="gfloat"/>
-      <field cname="yscale" type="gfloat"/>
-      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Xscale" cname="xscale" type="gfloat" readable="true" writeable="true"/>
-      <property name="Yscale" cname="yscale" type="gfloat" readable="true" writeable="true"/>
+      <field cname="xalign" type="gfloat" />
+      <field cname="yalign" type="gfloat" />
+      <field cname="xscale" type="gfloat" />
+      <field cname="yscale" type="gfloat" />
+      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Xscale" cname="xscale" type="gfloat" readable="true" writeable="true" />
+      <property name="Yscale" cname="yscale" type="gfloat" readable="true" writeable="true" />
       <method name="GetType" cname="gtk_alignment_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_alignment_new">
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
-          <parameter type="gfloat" name="xscale"/>
-          <parameter type="gfloat" name="yscale"/>
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
+          <parameter type="gfloat" name="xscale" />
+          <parameter type="gfloat" name="yscale" />
         </parameters>
       </constructor>
       <method name="Set" cname="gtk_alignment_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
-          <parameter type="gfloat" name="xscale"/>
-          <parameter type="gfloat" name="yscale"/>
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
+          <parameter type="gfloat" name="xscale" />
+          <parameter type="gfloat" name="yscale" />
         </parameters>
       </method>
     </object>
     <object name="Arrow" cname="GtkArrow" parent="GtkMisc">
-      <field cname="arrow_type" type="gint16"/>
-      <field cname="shadow_type" type="gint16"/>
-      <property name="ArrowType" cname="arrow_type" type="GtkArrowType" readable="true" writeable="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true"/>
+      <field cname="arrow_type" type="gint16" />
+      <field cname="shadow_type" type="gint16" />
+      <property name="ArrowType" cname="arrow_type" type="GtkArrowType" readable="true" writeable="true" />
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" />
       <method name="GetType" cname="gtk_arrow_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_arrow_new">
         <parameters>
-          <parameter type="GtkArrowType" name="arrow_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
+          <parameter type="GtkArrowType" name="arrow_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
         </parameters>
       </constructor>
       <method name="Set" cname="gtk_arrow_set" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkArrowType" name="arrow_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
+          <parameter type="GtkArrowType" name="arrow_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
         </parameters>
       </method>
     </object>
     <object name="AspectFrame" cname="GtkAspectFrame" parent="GtkFrame">
-      <field cname="xalign" type="gfloat"/>
-      <field cname="yalign" type="gfloat"/>
-      <field cname="ratio" type="gfloat"/>
-      <field cname="obey_child" type="gboolean"/>
-      <field cname="center_allocation" type="GtkAllocation"/>
-      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Ratio" cname="ratio" type="gfloat" readable="true" writeable="true"/>
-      <property name="ObeyChild" cname="obey_child" type="gboolean" readable="true" writeable="true"/>
+      <field cname="xalign" type="gfloat" />
+      <field cname="yalign" type="gfloat" />
+      <field cname="ratio" type="gfloat" />
+      <field cname="obey_child" type="gboolean" />
+      <field cname="center_allocation" type="GtkAllocation" />
+      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Ratio" cname="ratio" type="gfloat" readable="true" writeable="true" />
+      <property name="ObeyChild" cname="obey_child" type="gboolean" readable="true" writeable="true" />
       <method name="GetType" cname="gtk_aspect_frame_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_aspect_frame_new">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
-          <parameter type="gfloat" name="ratio"/>
-          <parameter type="gboolean" name="obey_child"/>
+          <parameter type="const-gchar*" name="label" />
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
+          <parameter type="gfloat" name="ratio" />
+          <parameter type="gboolean" name="obey_child" />
         </parameters>
       </constructor>
       <method name="Set" cname="gtk_aspect_frame_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
-          <parameter type="gfloat" name="ratio"/>
-          <parameter type="gboolean" name="obey_child"/>
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
+          <parameter type="gfloat" name="ratio" />
+          <parameter type="gboolean" name="obey_child" />
         </parameters>
       </method>
     </object>
     <object name="Bin" cname="GtkBin" parent="GtkContainer">
-      <field cname="child" type="GtkWidget*"/>
+      <field cname="child" type="GtkWidget*" />
       <method name="GetChild" cname="gtk_bin_get_child" new_flag="1">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gtk_bin_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="Box" cname="GtkBox" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="spacing" type="gint16"/>
-      <field cname="homogeneous" bits="1" type="guint"/>
-      <property name="Spacing" cname="spacing" type="gint" readable="true" writeable="true"/>
-      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true"/>
+      <field cname="children" type="GList*" />
+      <field cname="spacing" type="gint16" />
+      <field cname="homogeneous" bits="1" type="guint" />
+      <property name="Spacing" cname="spacing" type="gint" readable="true" writeable="true" />
+      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true" />
       <method name="GetHomogeneous" cname="gtk_box_get_homogeneous">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSpacing" cname="gtk_box_get_spacing">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gtk_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PackEnd" cname="gtk_box_pack_end">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="expand"/>
-          <parameter type="gboolean" name="fill"/>
-          <parameter type="guint" name="padding"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="expand" />
+          <parameter type="gboolean" name="fill" />
+          <parameter type="guint" name="padding" />
         </parameters>
       </method>
       <method name="PackEnd" cname="gtk_box_pack_end_defaults">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="PackStart" cname="gtk_box_pack_start">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="expand"/>
-          <parameter type="gboolean" name="fill"/>
-          <parameter type="guint" name="padding"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="expand" />
+          <parameter type="gboolean" name="fill" />
+          <parameter type="guint" name="padding" />
         </parameters>
       </method>
       <method name="PackStart" cname="gtk_box_pack_start_defaults">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="QueryChildPacking" cname="gtk_box_query_child_packing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean*" name="expand"/>
-          <parameter type="gboolean*" name="fill"/>
-          <parameter type="guint*" name="padding"/>
-          <parameter type="GtkPackType*" name="pack_type"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean*" name="expand" />
+          <parameter type="gboolean*" name="fill" />
+          <parameter type="guint*" name="padding" />
+          <parameter type="GtkPackType*" name="pack_type" />
         </parameters>
       </method>
       <method name="ReorderChild" cname="gtk_box_reorder_child">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="SetChildPacking" cname="gtk_box_set_child_packing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="expand"/>
-          <parameter type="gboolean" name="fill"/>
-          <parameter type="guint" name="padding"/>
-          <parameter type="GtkPackType" name="pack_type"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="expand" />
+          <parameter type="gboolean" name="fill" />
+          <parameter type="guint" name="padding" />
+          <parameter type="GtkPackType" name="pack_type" />
         </parameters>
       </method>
       <method name="SetHomogeneous" cname="gtk_box_set_homogeneous">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="homogeneous"/>
+          <parameter type="gboolean" name="homogeneous" />
         </parameters>
       </method>
       <method name="SetSpacing" cname="gtk_box_set_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="spacing"/>
+          <parameter type="gint" name="spacing" />
         </parameters>
       </method>
     </object>
     <object name="Button" cname="GtkButton" parent="GtkBin">
-      <field cname="event_window" type="GdkWindow*"/>
-      <field cname="label_text" type="gchar*"/>
-      <field cname="activate_timeout" type="guint"/>
-      <field cname="constructed" bits="1" type="guint"/>
-      <field cname="in_button" bits="1" type="guint"/>
-      <field cname="button_down" bits="1" type="guint"/>
-      <field cname="relief" bits="2" type="guint"/>
-      <field cname="use_underline" bits="1" type="guint"/>
-      <field cname="use_stock" bits="1" type="guint"/>
-      <field cname="depressed" bits="1" type="guint"/>
-      <field cname="depress_on_activate" bits="1" type="guint"/>
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct-only="true"/>
-      <property name="Relief" cname="relief" type="GtkReliefStyle" readable="true" writeable="true"/>
+      <field cname="event_window" type="GdkWindow*" />
+      <field cname="label_text" type="gchar*" />
+      <field cname="activate_timeout" type="guint" />
+      <field cname="constructed" bits="1" type="guint" />
+      <field cname="in_button" bits="1" type="guint" />
+      <field cname="button_down" bits="1" type="guint" />
+      <field cname="relief" bits="2" type="guint" />
+      <field cname="use_underline" bits="1" type="guint" />
+      <field cname="use_stock" bits="1" type="guint" />
+      <field cname="depressed" bits="1" type="guint" />
+      <field cname="depress_on_activate" bits="1" type="guint" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Relief" cname="relief" type="GtkReliefStyle" readable="true" writeable="true" />
       <signal name="Pressed" cname="pressed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <signal name="Released" cname="released" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <signal name="Clicked" cname="clicked" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <signal name="Entered" cname="enter" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <signal name="Left" cname="leave" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <signal name="Activated" cname="activate" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButton*" name="button"/>
+          <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
       <method name="ActionGetType" cname="gtk_button_action_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Click" cname="gtk_button_clicked">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Enter" cname="gtk_button_enter">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetLabel" cname="gtk_button_get_label">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetRelief" cname="gtk_button_get_relief">
-        <return-type type="GtkReliefStyle"/>
+        <return-type type="GtkReliefStyle" />
       </method>
       <method name="GetType" cname="gtk_button_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUseStock" cname="gtk_button_get_use_stock">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetUseUnderline" cname="gtk_button_get_use_underline">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Leave" cname="gtk_button_leave">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
-      <constructor cname="gtk_button_new"/>
+      <constructor cname="gtk_button_new" />
       <constructor cname="gtk_button_new_from_stock">
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="const-gchar*" name="stock_id" />
         </parameters>
       </constructor>
       <constructor cname="gtk_button_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_button_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="Press" cname="gtk_button_pressed">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Release" cname="gtk_button_released">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetLabel" cname="gtk_button_set_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </method>
       <method name="SetRelief" cname="gtk_button_set_relief">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkReliefStyle" name="newstyle"/>
+          <parameter type="GtkReliefStyle" name="newstyle" />
         </parameters>
       </method>
       <method name="SetUseStock" cname="gtk_button_set_use_stock">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="use_stock"/>
+          <parameter type="gboolean" name="use_stock" />
         </parameters>
       </method>
       <method name="SetUseUnderline" cname="gtk_button_set_use_underline">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="use_underline"/>
+          <parameter type="gboolean" name="use_underline" />
         </parameters>
       </method>
     </object>
     <object name="ButtonBox" cname="GtkButtonBox" parent="GtkBox">
-      <field cname="child_min_width" type="gint"/>
-      <field cname="child_min_height" type="gint"/>
-      <field cname="child_ipad_x" type="gint"/>
-      <field cname="child_ipad_y" type="gint"/>
-      <field cname="layout_style" type="GtkButtonBoxStyle"/>
-      <property name="LayoutStyle" cname="layout_style" type="GtkButtonBoxStyle" readable="true" writeable="true"/>
+      <field cname="child_min_width" type="gint" />
+      <field cname="child_min_height" type="gint" />
+      <field cname="child_ipad_x" type="gint" />
+      <field cname="child_ipad_y" type="gint" />
+      <field cname="layout_style" type="GtkButtonBoxStyle" />
+      <property name="LayoutStyle" cname="layout_style" type="GtkButtonBoxStyle" readable="true" writeable="true" />
       <method name="GetLayout" cname="gtk_button_box_get_layout">
-        <return-type type="GtkButtonBoxStyle"/>
+        <return-type type="GtkButtonBoxStyle" />
       </method>
       <method name="GetType" cname="gtk_button_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SetChildSecondary" cname="gtk_button_box_set_child_secondary">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="is_secondary"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="is_secondary" />
         </parameters>
       </method>
       <method name="SetLayout" cname="gtk_button_box_set_layout">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkButtonBoxStyle" name="layout_style"/>
+          <parameter type="GtkButtonBoxStyle" name="layout_style" />
         </parameters>
       </method>
     </object>
     <object name="Calendar" cname="GtkCalendar" parent="GtkWidget">
-      <field cname="header_style" type="GtkStyle*"/>
-      <field cname="label_style" type="GtkStyle*"/>
-      <field cname="month" type="gint"/>
-      <field cname="year" type="gint"/>
-      <field cname="selected_day" type="gint"/>
-      <field cname="day_month" array_len="6][7" type="gint"/>
-      <field cname="day" array_len="6][7" type="gint"/>
-      <field cname="num_marked_dates" type="gint"/>
-      <field cname="marked_date" array_len="31" type="gint"/>
-      <field cname="display_flags" type="GtkCalendarDisplayOptions"/>
-      <field cname="marked_date_color" array_len="31" type="GdkColor"/>
-      <field cname="gc" type="GdkGC*"/>
-      <field cname="xor_gc" type="GdkGC*"/>
-      <field cname="focus_row" type="gint"/>
-      <field cname="focus_col" type="gint"/>
-      <field cname="highlight_row" type="gint"/>
-      <field cname="highlight_col" type="gint"/>
-      <field cname="private_data" type="gpointer"/>
-      <field cname="grow_space" array_len="32" type="gchar"/>
+      <field cname="header_style" type="GtkStyle*" />
+      <field cname="label_style" type="GtkStyle*" />
+      <field cname="month" type="gint" />
+      <field cname="year" type="gint" />
+      <field cname="selected_day" type="gint" />
+      <field cname="day_month" array_len="6][7" type="gint" />
+      <field cname="day" array_len="6][7" type="gint" />
+      <field cname="num_marked_dates" type="gint" />
+      <field cname="marked_date" array_len="31" type="gint" />
+      <field cname="display_flags" type="GtkCalendarDisplayOptions" />
+      <field cname="marked_date_color" array_len="31" type="GdkColor" />
+      <field cname="gc" type="GdkGC*" />
+      <field cname="xor_gc" type="GdkGC*" />
+      <field cname="focus_row" type="gint" />
+      <field cname="focus_col" type="gint" />
+      <field cname="highlight_row" type="gint" />
+      <field cname="highlight_col" type="gint" />
+      <field cname="private_data" type="gpointer" />
+      <field cname="grow_space" array_len="32" type="gchar" />
       <callback cname="_gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved1"/>
+          <parameter type="void " name="_gtk_reserved1" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved2"/>
+          <parameter type="void " name="_gtk_reserved2" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved3"/>
+          <parameter type="void " name="_gtk_reserved3" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved4"/>
+          <parameter type="void " name="_gtk_reserved4" />
         </parameters>
       </callback>
       <signal name="MonthChanged" cname="month_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="DaySelected" cname="day_selected" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="DaySelectedDoubleClick" cname="day_selected_double_click" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="PrevMonth" cname="prev_month" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="NextMonth" cname="next_month" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="PrevYear" cname="prev_year" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <signal name="NextYear" cname="next_year" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendar*" name="calendar"/>
+          <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
       <method name="ClearMarks" cname="gtk_calendar_clear_marks">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetDisplayOptions" cname="gtk_calendar_display_options">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCalendarDisplayOptions" name="flags"/>
+          <parameter type="GtkCalendarDisplayOptions" name="flags" />
         </parameters>
       </method>
       <method name="Freeze" cname="gtk_calendar_freeze">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetDate" cname="gtk_calendar_get_date">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint*" name="year"/>
-          <parameter type="guint*" name="month"/>
-          <parameter type="guint*" name="day"/>
+          <parameter type="guint*" name="year" />
+          <parameter type="guint*" name="month" />
+          <parameter type="guint*" name="day" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_calendar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="MarkDay" cname="gtk_calendar_mark_day">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="day"/>
+          <parameter type="guint" name="day" />
         </parameters>
       </method>
-      <constructor cname="gtk_calendar_new"/>
+      <constructor cname="gtk_calendar_new" />
       <method name="SelectDay" cname="gtk_calendar_select_day">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="day"/>
+          <parameter type="guint" name="day" />
         </parameters>
       </method>
       <method name="SelectMonth" cname="gtk_calendar_select_month">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="month"/>
-          <parameter type="guint" name="year"/>
+          <parameter type="guint" name="month" />
+          <parameter type="guint" name="year" />
         </parameters>
       </method>
       <method name="Thaw" cname="gtk_calendar_thaw">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UnmarkDay" cname="gtk_calendar_unmark_day">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="day"/>
+          <parameter type="guint" name="day" />
         </parameters>
       </method>
     </object>
     <object name="CellRenderer" cname="GtkCellRenderer" parent="GtkObject">
-      <field cname="xalign" type="gfloat"/>
-      <field cname="yalign" type="gfloat"/>
-      <field cname="width" type="gint"/>
-      <field cname="height" type="gint"/>
-      <field cname="xpad" type="guint16"/>
-      <field cname="ypad" type="guint16"/>
-      <field cname="mode" bits="2" type="guint"/>
-      <field cname="visible" bits="1" type="guint"/>
-      <field cname="is_expander" bits="1" type="guint"/>
-      <field cname="is_expanded" bits="1" type="guint"/>
-      <field cname="cell_background_set" bits="1" type="guint"/>
-      <property name="Mode" cname="mode" type="GtkCellRendererMode" readable="true" writeable="true"/>
-      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Xpad" cname="xpad" type="guint" readable="true" writeable="true"/>
-      <property name="Ypad" cname="ypad" type="guint" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="gint" readable="true" writeable="true"/>
-      <property name="Height" cname="height" type="gint" readable="true" writeable="true"/>
-      <property name="IsExpander" cname="is_expander" type="gboolean" readable="true" writeable="true"/>
-      <property name="IsExpanded" cname="is_expanded" type="gboolean" readable="true" writeable="true"/>
-      <property name="CellBackground" cname="cell_background" type="gchar*" writeable="true"/>
-      <property name="CellBackgroundGdk" cname="cell_background_gdk" type="GdkColor" readable="true" writeable="true"/>
+      <field cname="xalign" type="gfloat" />
+      <field cname="yalign" type="gfloat" />
+      <field cname="width" type="gint" />
+      <field cname="height" type="gint" />
+      <field cname="xpad" type="guint16" />
+      <field cname="ypad" type="guint16" />
+      <field cname="mode" bits="2" type="guint" />
+      <field cname="visible" bits="1" type="guint" />
+      <field cname="is_expander" bits="1" type="guint" />
+      <field cname="is_expanded" bits="1" type="guint" />
+      <field cname="cell_background_set" bits="1" type="guint" />
+      <property name="Mode" cname="mode" type="GtkCellRendererMode" readable="true" writeable="true" />
+      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
+      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Xpad" cname="xpad" type="guint" readable="true" writeable="true" />
+      <property name="Ypad" cname="ypad" type="guint" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="gint" readable="true" writeable="true" />
+      <property name="Height" cname="height" type="gint" readable="true" writeable="true" />
+      <property name="IsExpander" cname="is_expander" type="gboolean" readable="true" writeable="true" />
+      <property name="IsExpanded" cname="is_expanded" type="gboolean" readable="true" writeable="true" />
+      <property name="CellBackground" cname="cell_background" type="gchar*" writeable="true" />
+      <property name="CellBackgroundGdk" cname="cell_background_gdk" type="GdkColor" readable="true" writeable="true" />
       <method name="Activate" cname="gtk_cell_renderer_activate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GdkRectangle*" name="background_area"/>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="GtkCellRendererState" name="flags"/>
+          <parameter type="GdkEvent*" name="event" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GdkRectangle*" name="background_area" />
+          <parameter type="GdkRectangle*" name="cell_area" />
+          <parameter type="GtkCellRendererState" name="flags" />
         </parameters>
       </method>
       <method name="GetFixedSize" cname="gtk_cell_renderer_get_fixed_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="GetSize" cname="gtk_cell_renderer_get_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="gint*" name="x_offset"/>
-          <parameter type="gint*" name="y_offset"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkRectangle*" name="cell_area" />
+          <parameter type="gint*" name="x_offset" />
+          <parameter type="gint*" name="y_offset" />
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_cell_renderer_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Render" cname="gtk_cell_renderer_render">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkRectangle*" name="background_area"/>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="GdkRectangle*" name="expose_area"/>
-          <parameter type="GtkCellRendererState" name="flags"/>
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkRectangle*" name="background_area" />
+          <parameter type="GdkRectangle*" name="cell_area" />
+          <parameter type="GdkRectangle*" name="expose_area" />
+          <parameter type="GtkCellRendererState" name="flags" />
         </parameters>
       </method>
       <method name="SetFixedSize" cname="gtk_cell_renderer_set_fixed_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="StartEditing" cname="gtk_cell_renderer_start_editing">
-        <return-type type="GtkCellEditable*"/>
+        <return-type type="GtkCellEditable*" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GdkRectangle*" name="background_area"/>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="GtkCellRendererState" name="flags"/>
+          <parameter type="GdkEvent*" name="event" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GdkRectangle*" name="background_area" />
+          <parameter type="GdkRectangle*" name="cell_area" />
+          <parameter type="GtkCellRendererState" name="flags" />
         </parameters>
       </method>
     </object>
     <object name="CellRendererPixbuf" cname="GtkCellRendererPixbuf" parent="GtkCellRenderer">
-      <field cname="pixbuf" type="GdkPixbuf*"/>
-      <field cname="pixbuf_expander_open" type="GdkPixbuf*"/>
-      <field cname="pixbuf_expander_closed" type="GdkPixbuf*"/>
-      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="PixbufExpanderOpen" cname="pixbuf_expander_open" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="PixbufExpanderClosed" cname="pixbuf_expander_closed" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="StockId" cname="stock_id" type="gchar*" readable="true" writeable="true"/>
-      <property name="StockSize" cname="stock_size" type="GtkIconSize" readable="true" writeable="true"/>
-      <property name="StockDetail" cname="stock_detail" type="gchar*" readable="true" writeable="true"/>
+      <field cname="pixbuf" type="GdkPixbuf*" />
+      <field cname="pixbuf_expander_open" type="GdkPixbuf*" />
+      <field cname="pixbuf_expander_closed" type="GdkPixbuf*" />
+      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="PixbufExpanderOpen" cname="pixbuf_expander_open" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="PixbufExpanderClosed" cname="pixbuf_expander_closed" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="StockId" cname="stock_id" type="gchar*" readable="true" writeable="true" />
+      <property name="StockSize" cname="stock_size" type="GtkIconSize" readable="true" writeable="true" />
+      <property name="StockDetail" cname="stock_detail" type="gchar*" readable="true" writeable="true" />
       <method name="GetType" cname="gtk_cell_renderer_pixbuf_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_cell_renderer_pixbuf_new"/>
+      <constructor cname="gtk_cell_renderer_pixbuf_new" />
     </object>
     <object name="CellRendererText" cname="GtkCellRendererText" parent="GtkCellRenderer">
-      <field cname="text" type="gchar*"/>
-      <field cname="font" type="PangoFontDescription*"/>
-      <field cname="font_scale" type="gdouble"/>
-      <field cname="foreground" type="PangoColor"/>
-      <field cname="background" type="PangoColor"/>
-      <field cname="extra_attrs" type="PangoAttrList*"/>
-      <field cname="underline_style" type="PangoUnderline"/>
-      <field cname="rise" type="gint"/>
-      <field cname="fixed_height_rows" type="gint"/>
-      <field cname="strikethrough" bits="1" type="guint"/>
-      <field cname="editable" bits="1" type="guint"/>
-      <field cname="scale_set" bits="1" type="guint"/>
-      <field cname="foreground_set" bits="1" type="guint"/>
-      <field cname="background_set" bits="1" type="guint"/>
-      <field cname="underline_set" bits="1" type="guint"/>
-      <field cname="rise_set" bits="1" type="guint"/>
-      <field cname="strikethrough_set" bits="1" type="guint"/>
-      <field cname="editable_set" bits="1" type="guint"/>
-      <field cname="calc_fixed_height" bits="1" type="guint"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
-      <property name="Markup" cname="markup" type="gchar*" writeable="true"/>
-      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true"/>
-      <property name="Background" cname="background" type="gchar*" writeable="true"/>
-      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="Foreground" cname="foreground" type="gchar*" writeable="true"/>
-      <property name="ForegroundGdk" cname="foreground_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true"/>
-      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true"/>
-      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true"/>
-      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true"/>
-      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true"/>
-      <property name="Weight" cname="weight" type="gint" readable="true" writeable="true"/>
-      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true"/>
-      <property name="Size" cname="size" type="gint" readable="true" writeable="true"/>
-      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true"/>
-      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true"/>
-      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true"/>
-      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true"/>
-      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true"/>
+      <field cname="text" type="gchar*" />
+      <field cname="font" type="PangoFontDescription*" />
+      <field cname="font_scale" type="gdouble" />
+      <field cname="foreground" type="PangoColor" />
+      <field cname="background" type="PangoColor" />
+      <field cname="extra_attrs" type="PangoAttrList*" />
+      <field cname="underline_style" type="PangoUnderline" />
+      <field cname="rise" type="gint" />
+      <field cname="fixed_height_rows" type="gint" />
+      <field cname="strikethrough" bits="1" type="guint" />
+      <field cname="editable" bits="1" type="guint" />
+      <field cname="scale_set" bits="1" type="guint" />
+      <field cname="foreground_set" bits="1" type="guint" />
+      <field cname="background_set" bits="1" type="guint" />
+      <field cname="underline_set" bits="1" type="guint" />
+      <field cname="rise_set" bits="1" type="guint" />
+      <field cname="strikethrough_set" bits="1" type="guint" />
+      <field cname="editable_set" bits="1" type="guint" />
+      <field cname="calc_fixed_height" bits="1" type="guint" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
+      <property name="Markup" cname="markup" type="gchar*" writeable="true" />
+      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true" />
+      <property name="Background" cname="background" type="gchar*" writeable="true" />
+      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="Foreground" cname="foreground" type="gchar*" writeable="true" />
+      <property name="ForegroundGdk" cname="foreground_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true" />
+      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true" />
+      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true" />
+      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true" />
+      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true" />
+      <property name="Weight" cname="weight" type="gint" readable="true" writeable="true" />
+      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true" />
+      <property name="Size" cname="size" type="gint" readable="true" writeable="true" />
+      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true" />
+      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true" />
+      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true" />
+      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true" />
+      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true" />
       <signal name="Edited" cname="edited" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRendererText*" name="cell_renderer_text"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="const-gchar*" name="new_text"/>
+          <parameter type="GtkCellRendererText*" name="cell_renderer_text" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="const-gchar*" name="new_text" />
         </parameters>
       </signal>
       <method name="GetType" cname="gtk_cell_renderer_text_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_cell_renderer_text_new"/>
+      <constructor cname="gtk_cell_renderer_text_new" />
       <method name="SetFixedHeightFromFont" cname="gtk_cell_renderer_text_set_fixed_height_from_font">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="number_of_rows"/>
+          <parameter type="gint" name="number_of_rows" />
         </parameters>
       </method>
     </object>
     <object name="CellRendererToggle" cname="GtkCellRendererToggle" parent="GtkCellRenderer">
-      <field cname="active" bits="1" type="guint"/>
-      <field cname="activatable" bits="1" type="guint"/>
-      <field cname="radio" bits="1" type="guint"/>
-      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true"/>
-      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true"/>
-      <property name="Activatable" cname="activatable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Radio" cname="radio" type="gboolean" readable="true" writeable="true"/>
+      <field cname="active" bits="1" type="guint" />
+      <field cname="activatable" bits="1" type="guint" />
+      <field cname="radio" bits="1" type="guint" />
+      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
+      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true" />
+      <property name="Activatable" cname="activatable" type="gboolean" readable="true" writeable="true" />
+      <property name="Radio" cname="radio" type="gboolean" readable="true" writeable="true" />
       <signal name="Toggled" cname="toggled" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRendererToggle*" name="cell_renderer_toggle"/>
-          <parameter type="const-gchar*" name="path"/>
+          <parameter type="GtkCellRendererToggle*" name="cell_renderer_toggle" />
+          <parameter type="const-gchar*" name="path" />
         </parameters>
       </signal>
       <method name="GetActive" cname="gtk_cell_renderer_toggle_get_active">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetRadio" cname="gtk_cell_renderer_toggle_get_radio">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_cell_renderer_toggle_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_cell_renderer_toggle_new"/>
+      <constructor cname="gtk_cell_renderer_toggle_new" />
       <method name="SetActive" cname="gtk_cell_renderer_toggle_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetRadio" cname="gtk_cell_renderer_toggle_set_radio">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="radio"/>
+          <parameter type="gboolean" name="radio" />
         </parameters>
       </method>
     </object>
     <object name="CheckButton" cname="GtkCheckButton" parent="GtkToggleButton">
       <method name="GetType" cname="gtk_check_button_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_check_button_new"/>
+      <constructor cname="gtk_check_button_new" />
       <constructor cname="gtk_check_button_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_check_button_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
     </object>
     <object name="CheckMenuItem" cname="GtkCheckMenuItem" parent="GtkMenuItem">
-      <field cname="active" bits="1" type="guint"/>
-      <field cname="always_show_toggle" bits="1" type="guint"/>
-      <field cname="inconsistent" bits="1" type="guint"/>
-      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true"/>
-      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true"/>
+      <field cname="active" bits="1" type="guint" />
+      <field cname="always_show_toggle" bits="1" type="guint" />
+      <field cname="inconsistent" bits="1" type="guint" />
+      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
+      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true" />
       <signal name="Toggled" cname="toggled" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCheckMenuItem*" name="check_menu_item"/>
+          <parameter type="GtkCheckMenuItem*" name="check_menu_item" />
         </parameters>
       </signal>
       <method name="GetActive" cname="gtk_check_menu_item_get_active">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetInconsistent" cname="gtk_check_menu_item_get_inconsistent">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_check_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_check_menu_item_new"/>
+      <constructor cname="gtk_check_menu_item_new" />
       <constructor cname="gtk_check_menu_item_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_check_menu_item_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetActive" cname="gtk_check_menu_item_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="is_active"/>
+          <parameter type="gboolean" name="is_active" />
         </parameters>
       </method>
       <method name="SetInconsistent" cname="gtk_check_menu_item_set_inconsistent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="Toggle" cname="gtk_check_menu_item_toggled">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Clipboard" cname="GtkClipboard" parent="GObject">
       <method name="Clear" cname="gtk_clipboard_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Get" cname="gtk_clipboard_get" shared="true">
-        <return-type type="GtkClipboard*"/>
+        <return-type type="GtkClipboard*" />
         <parameters>
-          <parameter type="GdkAtom" name="selection"/>
+          <parameter type="GdkAtom" name="selection" />
         </parameters>
       </method>
       <method name="GetDisplay" cname="gtk_clipboard_get_display">
-        <return-type type="GdkDisplay*"/>
+        <return-type type="GdkDisplay*" />
       </method>
       <method name="GetForDisplay" cname="gtk_clipboard_get_for_display" shared="true">
-        <return-type type="GtkClipboard*"/>
+        <return-type type="GtkClipboard*" />
         <parameters>
-          <parameter type="GdkDisplay*" name="display"/>
-          <parameter type="GdkAtom" name="selection"/>
+          <parameter type="GdkDisplay*" name="display" />
+          <parameter type="GdkAtom" name="selection" />
         </parameters>
       </method>
       <method name="GetOwner" cname="gtk_clipboard_get_owner">
-        <return-type type="GObject*"/>
+        <return-type type="GObject*" />
       </method>
       <method name="GetType" cname="gtk_clipboard_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="RequestContents" cname="gtk_clipboard_request_contents">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="GtkClipboardReceivedFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="GtkClipboardReceivedFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="RequestText" cname="gtk_clipboard_request_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboardTextReceivedFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkClipboardTextReceivedFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_clipboard_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
       <method name="SetWithData" cname="gtk_clipboard_set_with_data">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="n_targets"/>
-          <parameter type="GtkClipboardGetFunc" name="get_func"/>
-          <parameter type="GtkClipboardClearFunc" name="clear_func"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="guint" name="n_targets" />
+          <parameter type="GtkClipboardGetFunc" name="get_func" />
+          <parameter type="GtkClipboardClearFunc" name="clear_func" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="SetWithOwner" cname="gtk_clipboard_set_with_owner">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="n_targets"/>
-          <parameter type="GtkClipboardGetFunc" name="get_func"/>
-          <parameter type="GtkClipboardClearFunc" name="clear_func"/>
-          <parameter type="GObject*" name="owner"/>
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="guint" name="n_targets" />
+          <parameter type="GtkClipboardGetFunc" name="get_func" />
+          <parameter type="GtkClipboardClearFunc" name="clear_func" />
+          <parameter type="GObject*" name="owner" />
         </parameters>
       </method>
       <method name="WaitForContents" cname="gtk_clipboard_wait_for_contents">
-        <return-type type="GtkSelectionData*"/>
+        <return-type type="GtkSelectionData*" />
         <parameters>
-          <parameter type="GdkAtom" name="target"/>
+          <parameter type="GdkAtom" name="target" />
         </parameters>
       </method>
       <method name="WaitForText" cname="gtk_clipboard_wait_for_text">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="WaitIsTextAvailable" cname="gtk_clipboard_wait_is_text_available">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
     </object>
     <object name="ColorSelection" cname="GtkColorSelection" parent="GtkVBox">
-      <field cname="private_data" type="gpointer"/>
-      <property name="HasOpacityControl" cname="has_opacity_control" type="gboolean" readable="true" writeable="true"/>
-      <property name="HasPalette" cname="has_palette" type="gboolean" readable="true" writeable="true"/>
-      <property name="CurrentColor" cname="current_color" type="GdkColor" readable="true" writeable="true"/>
-      <property name="CurrentAlpha" cname="current_alpha" type="guint" readable="true" writeable="true"/>
+      <field cname="private_data" type="gpointer" />
+      <property name="HasOpacityControl" cname="has_opacity_control" type="gboolean" readable="true" writeable="true" />
+      <property name="HasPalette" cname="has_palette" type="gboolean" readable="true" writeable="true" />
+      <property name="CurrentColor" cname="current_color" type="GdkColor" readable="true" writeable="true" />
+      <property name="CurrentAlpha" cname="current_alpha" type="guint" readable="true" writeable="true" />
       <signal name="ColorChanged" cname="color_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkColorSelection*" name="color_selection"/>
+          <parameter type="GtkColorSelection*" name="color_selection" />
         </parameters>
       </signal>
       <method name="GetCurrentAlpha" cname="gtk_color_selection_get_current_alpha">
-        <return-type type="guint16"/>
+        <return-type type="guint16" />
       </method>
       <method name="GetCurrentColor" cname="gtk_color_selection_get_current_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="GetHasOpacityControl" cname="gtk_color_selection_get_has_opacity_control">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetHasPalette" cname="gtk_color_selection_get_has_palette">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetPreviousAlpha" cname="gtk_color_selection_get_previous_alpha">
-        <return-type type="guint16"/>
+        <return-type type="guint16" />
       </method>
       <method name="GetPreviousColor" cname="gtk_color_selection_get_previous_color" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_color_selection_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="IsAdjusting" cname="gtk_color_selection_is_adjusting">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
-      <constructor cname="gtk_color_selection_new"/>
+      <constructor cname="gtk_color_selection_new" />
       <method name="PaletteFromString" cname="gtk_color_selection_palette_from_string" shared="true" hidden="1">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GdkColor**" name="colors"/>
-          <parameter type="gint*" name="n_colors"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="GdkColor**" name="colors" />
+          <parameter type="gint*" name="n_colors" />
         </parameters>
       </method>
       <method name="PaletteToString" cname="gtk_color_selection_palette_to_string" shared="true" hidden="1">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GdkColor*" name="colors"/>
-          <parameter type="gint" name="n_colors"/>
+          <parameter type="const-GdkColor*" name="colors" />
+          <parameter type="gint" name="n_colors" />
         </parameters>
       </method>
       <method name="SetChangePaletteHook" cname="gtk_color_selection_set_change_palette_hook" shared="true" hidden="1">
-        <return-type type="GtkColorSelectionChangePaletteFunc"/>
+        <return-type type="GtkColorSelectionChangePaletteFunc" />
         <parameters>
-          <parameter type="GtkColorSelectionChangePaletteFunc" name="func"/>
+          <parameter type="GtkColorSelectionChangePaletteFunc" name="func" />
         </parameters>
       </method>
       <method name="SetChangePaletteWithScreenHook" cname="gtk_color_selection_set_change_palette_with_screen_hook" shared="true" hidden="1">
-        <return-type type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+        <return-type type="GtkColorSelectionChangePaletteWithScreenFunc" />
         <parameters>
-          <parameter type="GtkColorSelectionChangePaletteWithScreenFunc" name="func"/>
+          <parameter type="GtkColorSelectionChangePaletteWithScreenFunc" name="func" />
         </parameters>
       </method>
       <method name="SetCurrentAlpha" cname="gtk_color_selection_set_current_alpha">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint16" name="alpha"/>
+          <parameter type="guint16" name="alpha" />
         </parameters>
       </method>
       <method name="SetCurrentColor" cname="gtk_color_selection_set_current_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="SetHasOpacityControl" cname="gtk_color_selection_set_has_opacity_control">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="has_opacity"/>
+          <parameter type="gboolean" name="has_opacity" />
         </parameters>
       </method>
       <method name="SetHasPalette" cname="gtk_color_selection_set_has_palette">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="has_palette"/>
+          <parameter type="gboolean" name="has_palette" />
         </parameters>
       </method>
       <method name="SetPreviousAlpha" cname="gtk_color_selection_set_previous_alpha">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint16" name="alpha"/>
+          <parameter type="guint16" name="alpha" />
         </parameters>
       </method>
       <method name="SetPreviousColor" cname="gtk_color_selection_set_previous_color" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
     </object>
     <object name="ColorSelectionDialog" cname="GtkColorSelectionDialog" parent="GtkDialog">
-      <field cname="colorsel" type="GtkWidget*"/>
-      <field cname="ok_button" type="GtkWidget*"/>
-      <field cname="cancel_button" type="GtkWidget*"/>
-      <field cname="help_button" type="GtkWidget*"/>
+      <field cname="colorsel" type="GtkWidget*" />
+      <field cname="ok_button" type="GtkWidget*" />
+      <field cname="cancel_button" type="GtkWidget*" />
+      <field cname="help_button" type="GtkWidget*" />
       <method name="GetType" cname="gtk_color_selection_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_color_selection_dialog_new">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </constructor>
     </object>
     <object name="Combo" cname="GtkCombo" parent="GtkHBox">
-      <field cname="entry" type="GtkWidget*"/>
-      <field cname="button" type="GtkWidget*"/>
-      <field cname="popup" type="GtkWidget*"/>
-      <field cname="popwin" type="GtkWidget*"/>
-      <field cname="list" type="GtkWidget*"/>
-      <field cname="entry_change_id" type="guint"/>
-      <field cname="list_change_id" type="guint"/>
-      <field cname="value_in_list" bits="1" type="guint"/>
-      <field cname="ok_if_empty" bits="1" type="guint"/>
-      <field cname="case_sensitive" bits="1" type="guint"/>
-      <field cname="use_arrows" bits="1" type="guint"/>
-      <field cname="use_arrows_always" bits="1" type="guint"/>
-      <field cname="current_button" type="guint16"/>
-      <field cname="activate_id" type="guint"/>
-      <property name="EnableArrowKeys" cname="enable_arrow_keys" type="gboolean" readable="true" writeable="true"/>
-      <property name="EnableArrowsAlways" cname="enable_arrows_always" type="gboolean" readable="true" writeable="true"/>
-      <property name="CaseSensitive" cname="case_sensitive" type="gboolean" readable="true" writeable="true"/>
-      <property name="AllowEmpty" cname="allow_empty" type="gboolean" readable="true" writeable="true"/>
-      <property name="ValueInList" cname="value_in_list" type="gboolean" readable="true" writeable="true"/>
+      <field cname="entry" type="GtkWidget*" />
+      <field cname="button" type="GtkWidget*" />
+      <field cname="popup" type="GtkWidget*" />
+      <field cname="popwin" type="GtkWidget*" />
+      <field cname="list" type="GtkWidget*" />
+      <field cname="entry_change_id" type="guint" />
+      <field cname="list_change_id" type="guint" />
+      <field cname="value_in_list" bits="1" type="guint" />
+      <field cname="ok_if_empty" bits="1" type="guint" />
+      <field cname="case_sensitive" bits="1" type="guint" />
+      <field cname="use_arrows" bits="1" type="guint" />
+      <field cname="use_arrows_always" bits="1" type="guint" />
+      <field cname="current_button" type="guint16" />
+      <field cname="activate_id" type="guint" />
+      <property name="EnableArrowKeys" cname="enable_arrow_keys" type="gboolean" readable="true" writeable="true" />
+      <property name="EnableArrowsAlways" cname="enable_arrows_always" type="gboolean" readable="true" writeable="true" />
+      <property name="CaseSensitive" cname="case_sensitive" type="gboolean" readable="true" writeable="true" />
+      <property name="AllowEmpty" cname="allow_empty" type="gboolean" readable="true" writeable="true" />
+      <property name="ValueInList" cname="value_in_list" type="gboolean" readable="true" writeable="true" />
       <method name="DisableActivate" cname="gtk_combo_disable_activate">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_combo_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_combo_new"/>
+      <constructor cname="gtk_combo_new" />
       <method name="SetCaseSensitive" cname="gtk_combo_set_case_sensitive">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="val"/>
+          <parameter type="gboolean" name="val" />
         </parameters>
       </method>
       <method name="SetItemString" cname="gtk_combo_set_item_string">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItem*" name="item"/>
-          <parameter type="const-gchar*" name="item_value"/>
+          <parameter type="GtkItem*" name="item" />
+          <parameter type="const-gchar*" name="item_value" />
         </parameters>
       </method>
       <method name="SetPopdownStrings" cname="gtk_combo_set_popdown_strings">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="strings"/>
+          <parameter type="GList*" name="strings" />
         </parameters>
       </method>
       <method name="SetUseArrows" cname="gtk_combo_set_use_arrows">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="val"/>
+          <parameter type="gboolean" name="val" />
         </parameters>
       </method>
       <method name="SetUseArrowsAlways" cname="gtk_combo_set_use_arrows_always">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="val"/>
+          <parameter type="gboolean" name="val" />
         </parameters>
       </method>
       <method name="SetValueInList" cname="gtk_combo_set_value_in_list">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="val"/>
-          <parameter type="gboolean" name="ok_if_empty"/>
+          <parameter type="gboolean" name="val" />
+          <parameter type="gboolean" name="ok_if_empty" />
         </parameters>
       </method>
     </object>
     <object name="Container" cname="GtkContainer" parent="GtkWidget">
-      <field cname="focus_child" type="GtkWidget*"/>
-      <field cname="border_width" bits="16" type="guint"/>
-      <field cname="need_resize" bits="1" type="guint"/>
-      <field cname="resize_mode" bits="2" type="guint"/>
-      <field cname="reallocate_redraws" bits="1" type="guint"/>
-      <field cname="has_focus_chain" bits="1" type="guint"/>
-      <property name="ResizeMode" cname="resize_mode" type="GtkResizeMode" readable="true" writeable="true"/>
-      <property name="BorderWidth" cname="border_width" type="guint" readable="true" writeable="true"/>
-      <property name="Child" cname="child" type="GtkWidget" writeable="true"/>
+      <field cname="focus_child" type="GtkWidget*" />
+      <field cname="border_width" bits="16" type="guint" />
+      <field cname="need_resize" bits="1" type="guint" />
+      <field cname="resize_mode" bits="2" type="guint" />
+      <field cname="reallocate_redraws" bits="1" type="guint" />
+      <field cname="has_focus_chain" bits="1" type="guint" />
+      <property name="ResizeMode" cname="resize_mode" type="GtkResizeMode" readable="true" writeable="true" />
+      <property name="BorderWidth" cname="border_width" type="guint" readable="true" writeable="true" />
+      <property name="Child" cname="child" type="GtkWidget" writeable="true" />
       <signal name="Added" cname="add" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkContainer*" name="container"/>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkContainer*" name="container" />
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Removed" cname="remove" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkContainer*" name="container"/>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkContainer*" name="container" />
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="ResizeChecked" cname="check_resize" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkContainer*" name="container"/>
+          <parameter type="GtkContainer*" name="container" />
         </parameters>
       </signal>
       <signal name="FocusChildSet" cname="set-focus-child" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkContainer*" name="container"/>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkContainer*" name="container" />
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <method name="Add" cname="gtk_container_add">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="AddWithProperties" cname="gtk_container_add_with_properties">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="first_prop_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="CheckResize" cname="gtk_container_check_resize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ChildGet" cname="gtk_container_child_get">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="first_prop_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="ChildGetProperty" cname="gtk_container_child_get_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="GValue*" name="value"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="property_name" />
+          <parameter type="GValue*" name="value" />
         </parameters>
       </method>
       <method name="ChildGetValist" cname="gtk_container_child_get_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="ChildSet" cname="gtk_container_child_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="first_prop_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="ChildSetProperty" cname="gtk_container_child_set_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="const-GValue*" name="value"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="property_name" />
+          <parameter type="const-GValue*" name="value" />
         </parameters>
       </method>
       <method name="ChildSetValist" cname="gtk_container_child_set_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="ChildType" cname="gtk_container_child_type">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="ClassFindChildProperty" cname="gtk_container_class_find_child_property" shared="true">
-        <return-type type="GParamSpec*"/>
+        <return-type type="GParamSpec*" />
         <parameters>
-          <parameter type="GObjectClass*" name="cclass"/>
-          <parameter type="const-gchar*" name="property_name"/>
+          <parameter type="GObjectClass*" name="cclass" />
+          <parameter type="const-gchar*" name="property_name" />
         </parameters>
       </method>
       <method name="ClassInstallChildProperty" cname="gtk_container_class_install_child_property" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkContainerClass*" name="cclass"/>
-          <parameter type="guint" name="property_id"/>
-          <parameter type="GParamSpec*" name="pspec"/>
+          <parameter type="GtkContainerClass*" name="cclass" />
+          <parameter type="guint" name="property_id" />
+          <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </method>
       <method name="ClassListChildProperties" cname="gtk_container_class_list_child_properties" shared="true">
-        <return-type type="GParamSpec**"/>
+        <return-type type="GParamSpec**" />
         <parameters>
-          <parameter type="GObjectClass*" name="cclass"/>
-          <parameter type="guint*" name="n_properties"/>
+          <parameter type="GObjectClass*" name="cclass" />
+          <parameter type="guint*" name="n_properties" />
         </parameters>
       </method>
       <method name="Forall" cname="gtk_container_forall">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCallback" name="callback"/>
-          <parameter type="gpointer" name="callback_data"/>
+          <parameter type="GtkCallback" name="callback" />
+          <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
       <method name="Foreach" cname="gtk_container_foreach">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCallback" name="callback"/>
-          <parameter type="gpointer" name="callback_data"/>
+          <parameter type="GtkCallback" name="callback" />
+          <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
       <method name="GetBorderWidth" cname="gtk_container_get_border_width">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetChildren" cname="gtk_container_get_children">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="GetFocusChain" cname="gtk_container_get_focus_chain">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GList**" name="focusable_widgets"/>
+          <parameter type="GList**" name="focusable_widgets" />
         </parameters>
       </method>
       <method name="GetFocusHadjustment" cname="gtk_container_get_focus_hadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetFocusVadjustment" cname="gtk_container_get_focus_vadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetResizeMode" cname="gtk_container_get_resize_mode">
-        <return-type type="GtkResizeMode"/>
+        <return-type type="GtkResizeMode" />
       </method>
       <method name="GetType" cname="gtk_container_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PropagateExpose" cname="gtk_container_propagate_expose">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GdkEventExpose*" name="event"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GdkEventExpose*" name="event" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_container_remove">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="ResizeChildren" cname="gtk_container_resize_children">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetBorderWidth" cname="gtk_container_set_border_width">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="border_width"/>
+          <parameter type="guint" name="border_width" />
         </parameters>
       </method>
       <method name="SetFocusChain" cname="gtk_container_set_focus_chain">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="focusable_widgets"/>
+          <parameter type="GList*" name="focusable_widgets" />
         </parameters>
       </method>
       <method name="SetFocusChild" cname="gtk_container_set_focus_child">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="SetFocusHadjustment" cname="gtk_container_set_focus_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetReallocateRedraws" cname="gtk_container_set_reallocate_redraws">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="needs_redraws"/>
+          <parameter type="gboolean" name="needs_redraws" />
         </parameters>
       </method>
       <method name="SetResizeMode" cname="gtk_container_set_resize_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkResizeMode" name="resize_mode"/>
+          <parameter type="GtkResizeMode" name="resize_mode" />
         </parameters>
       </method>
       <method name="UnsetFocusChain" cname="gtk_container_unset_focus_chain">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Curve" cname="GtkCurve" parent="GtkDrawingArea">
-      <field cname="cursor_type" type="gint"/>
-      <field cname="min_x" type="gfloat"/>
-      <field cname="max_x" type="gfloat"/>
-      <field cname="min_y" type="gfloat"/>
-      <field cname="max_y" type="gfloat"/>
-      <field cname="pixmap" type="GdkPixmap*"/>
-      <field cname="curve_type" type="GtkCurveType"/>
-      <field cname="height" type="gint"/>
-      <field cname="grab_point" type="gint"/>
-      <field cname="last" type="gint"/>
-      <field cname="num_points" type="gint"/>
-      <field cname="point" type="GdkPoint*"/>
-      <field cname="num_ctlpoints" type="gint"/>
-      <field cname="(*ctlpoint)[2]" type="gfloat"/>
-      <property name="CurveType" cname="curve_type" type="GtkCurveType" readable="true" writeable="true"/>
-      <property name="MinX" cname="min_x" type="gfloat" readable="true" writeable="true"/>
-      <property name="MaxX" cname="max_x" type="gfloat" readable="true" writeable="true"/>
-      <property name="MinY" cname="min_y" type="gfloat" readable="true" writeable="true"/>
-      <property name="MaxY" cname="max_y" type="gfloat" readable="true" writeable="true"/>
+      <field cname="cursor_type" type="gint" />
+      <field cname="min_x" type="gfloat" />
+      <field cname="max_x" type="gfloat" />
+      <field cname="min_y" type="gfloat" />
+      <field cname="max_y" type="gfloat" />
+      <field cname="pixmap" type="GdkPixmap*" />
+      <field cname="curve_type" type="GtkCurveType" />
+      <field cname="height" type="gint" />
+      <field cname="grab_point" type="gint" />
+      <field cname="last" type="gint" />
+      <field cname="num_points" type="gint" />
+      <field cname="point" type="GdkPoint*" />
+      <field cname="num_ctlpoints" type="gint" />
+      <field cname="(*ctlpoint)[2]" type="gfloat" />
+      <property name="CurveType" cname="curve_type" type="GtkCurveType" readable="true" writeable="true" />
+      <property name="MinX" cname="min_x" type="gfloat" readable="true" writeable="true" />
+      <property name="MaxX" cname="max_x" type="gfloat" readable="true" writeable="true" />
+      <property name="MinY" cname="min_y" type="gfloat" readable="true" writeable="true" />
+      <property name="MaxY" cname="max_y" type="gfloat" readable="true" writeable="true" />
       <signal name="CurveTypeChanged" cname="curve_type_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCurve*" name="curve"/>
+          <parameter type="GtkCurve*" name="curve" />
         </parameters>
       </signal>
       <method name="GetType" cname="gtk_curve_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVector" cname="gtk_curve_get_vector">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="veclen"/>
-          <parameter type="gfloat" array="true" name="vector"/>
+          <parameter type="int" name="veclen" />
+          <parameter type="gfloat" array="true" name="vector" />
         </parameters>
       </method>
-      <constructor cname="gtk_curve_new"/>
+      <constructor cname="gtk_curve_new" />
       <method name="Reset" cname="gtk_curve_reset">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetCurveType" cname="gtk_curve_set_curve_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCurveType" name="type"/>
+          <parameter type="GtkCurveType" name="type" />
         </parameters>
       </method>
       <method name="SetGamma" cname="gtk_curve_set_gamma">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="gamma_"/>
+          <parameter type="gfloat" name="gamma_" />
         </parameters>
       </method>
       <method name="SetRange" cname="gtk_curve_set_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="min_x"/>
-          <parameter type="gfloat" name="max_x"/>
-          <parameter type="gfloat" name="min_y"/>
-          <parameter type="gfloat" name="max_y"/>
+          <parameter type="gfloat" name="min_x" />
+          <parameter type="gfloat" name="max_x" />
+          <parameter type="gfloat" name="min_y" />
+          <parameter type="gfloat" name="max_y" />
         </parameters>
       </method>
       <method name="SetVector" cname="gtk_curve_set_vector">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int" name="veclen"/>
-          <parameter type="gfloat" array="true" name="vector"/>
+          <parameter type="int" name="veclen" />
+          <parameter type="gfloat" array="true" name="vector" />
         </parameters>
       </method>
     </object>
     <object name="Dialog" cname="GtkDialog" parent="GtkWindow">
-      <field cname="vbox" type="GtkWidget*"/>
-      <field cname="action_area" type="GtkWidget*"/>
-      <field cname="separator" type="GtkWidget*"/>
-      <property name="HasSeparator" cname="has_separator" type="gboolean" readable="true" writeable="true"/>
+      <field cname="vbox" type="GtkWidget*" />
+      <field cname="action_area" type="GtkWidget*" />
+      <field cname="separator" type="GtkWidget*" />
+      <property name="HasSeparator" cname="has_separator" type="gboolean" readable="true" writeable="true" />
       <signal name="Response" cname="response" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkDialog*" name="dialog"/>
-          <parameter type="gint" name="response_id"/>
+          <parameter type="GtkDialog*" name="dialog" />
+          <parameter type="gint" name="response_id" />
         </parameters>
       </signal>
       <signal name="Close" cname="close" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkDialog*" name="dialog"/>
+          <parameter type="GtkDialog*" name="dialog" />
         </parameters>
       </signal>
       <method name="AddActionWidget" cname="gtk_dialog_add_action_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="response_id"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="response_id" />
         </parameters>
       </method>
       <method name="AddButton" cname="gtk_dialog_add_button">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="button_text"/>
-          <parameter type="gint" name="response_id"/>
+          <parameter type="const-gchar*" name="button_text" />
+          <parameter type="gint" name="response_id" />
         </parameters>
       </method>
       <method name="AddButtons" cname="gtk_dialog_add_buttons">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="first_button_text" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="GetHasSeparator" cname="gtk_dialog_get_has_separator">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_dialog_new"/>
+      <constructor cname="gtk_dialog_new" />
       <constructor cname="gtk_dialog_new_with_buttons">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkWindow*" name="parent" null_ok="1"/>
-          <parameter type="GtkDialogFlags" name="flags"/>
-          <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GtkWindow*" name="parent" null_ok="1" />
+          <parameter type="GtkDialogFlags" name="flags" />
+          <parameter type="const-gchar*" name="first_button_text" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <method name="Respond" cname="gtk_dialog_response">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="response_id"/>
+          <parameter type="gint" name="response_id" />
         </parameters>
       </method>
       <method name="Run" cname="gtk_dialog_run">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="SetDefaultResponse" cname="gtk_dialog_set_default_response">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="response_id"/>
+          <parameter type="gint" name="response_id" />
         </parameters>
       </method>
       <method name="SetHasSeparator" cname="gtk_dialog_set_has_separator">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetResponseSensitive" cname="gtk_dialog_set_response_sensitive">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="response_id"/>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gint" name="response_id" />
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
     </object>
     <object name="DrawingArea" cname="GtkDrawingArea" parent="GtkWidget">
-      <field cname="draw_data" type="gpointer"/>
+      <field cname="draw_data" type="gpointer" />
       <method name="GetType" cname="gtk_drawing_area_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_drawing_area_new"/>
+      <constructor cname="gtk_drawing_area_new" />
     </object>
     <object name="Entry" cname="GtkEntry" parent="GtkWidget">
-      <field cname="text" type="gchar*"/>
-      <field cname="editable" bits="1" type="guint"/>
-      <field cname="visible" bits="1" type="guint"/>
-      <field cname="overwrite_mode" bits="1" type="guint"/>
-      <field cname="in_drag" bits="1" type="guint"/>
-      <field cname="text_length" type="guint16"/>
-      <field cname="text_max_length" type="guint16"/>
-      <field cname="text_area" type="GdkWindow*"/>
-      <field cname="im_context" type="GtkIMContext*"/>
-      <field cname="popup_menu" type="GtkWidget*"/>
-      <field cname="current_pos" type="gint"/>
-      <field cname="selection_bound" type="gint"/>
-      <field cname="cached_layout" type="PangoLayout*"/>
-      <field cname="cache_includes_preedit" bits="1" type="guint"/>
-      <field cname="need_im_reset" bits="1" type="guint"/>
-      <field cname="has_frame" bits="1" type="guint"/>
-      <field cname="activates_default" bits="1" type="guint"/>
-      <field cname="cursor_visible" bits="1" type="guint"/>
-      <field cname="in_click" bits="1" type="guint"/>
-      <field cname="is_cell_renderer" bits="1" type="guint"/>
-      <field cname="editing_canceled" bits="1" type="guint"/>
-      <field cname="mouse_cursor_obscured" bits="1" type="guint"/>
-      <field cname="button" type="guint"/>
-      <field cname="blink_timeout" type="guint"/>
-      <field cname="recompute_idle" type="guint"/>
-      <field cname="scroll_offset" type="gint"/>
-      <field cname="ascent" type="gint"/>
-      <field cname="descent" type="gint"/>
-      <field cname="text_size" type="guint16"/>
-      <field cname="n_bytes" type="guint16"/>
-      <field cname="preedit_length" type="guint16"/>
-      <field cname="preedit_cursor" type="guint16"/>
-      <field cname="dnd_position" type="gint"/>
-      <field cname="drag_start_x" type="gint"/>
-      <field cname="drag_start_y" type="gint"/>
-      <field cname="invisible_char" type="gunichar"/>
-      <field cname="width_chars" type="gint"/>
-      <property name="CursorPosition" cname="cursor_position" type="gint" readable="true"/>
-      <property name="SelectionBound" cname="selection_bound" type="gint" readable="true"/>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="MaxLength" cname="max_length" type="gint" readable="true" writeable="true"/>
-      <property name="Visibility" cname="visibility" type="gboolean" readable="true" writeable="true"/>
-      <property name="HasFrame" cname="has_frame" type="gboolean" readable="true" writeable="true"/>
-      <property name="InvisibleChar" cname="invisible_char" type="unichar" readable="true" writeable="true"/>
-      <property name="ActivatesDefault" cname="activates_default" type="gboolean" readable="true" writeable="true"/>
-      <property name="WidthChars" cname="width_chars" type="gint" readable="true" writeable="true"/>
-      <property name="ScrollOffset" cname="scroll_offset" type="gint" readable="true"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
+      <field cname="text" type="gchar*" />
+      <field cname="editable" bits="1" type="guint" />
+      <field cname="visible" bits="1" type="guint" />
+      <field cname="overwrite_mode" bits="1" type="guint" />
+      <field cname="in_drag" bits="1" type="guint" />
+      <field cname="text_length" type="guint16" />
+      <field cname="text_max_length" type="guint16" />
+      <field cname="text_area" type="GdkWindow*" />
+      <field cname="im_context" type="GtkIMContext*" />
+      <field cname="popup_menu" type="GtkWidget*" />
+      <field cname="current_pos" type="gint" />
+      <field cname="selection_bound" type="gint" />
+      <field cname="cached_layout" type="PangoLayout*" />
+      <field cname="cache_includes_preedit" bits="1" type="guint" />
+      <field cname="need_im_reset" bits="1" type="guint" />
+      <field cname="has_frame" bits="1" type="guint" />
+      <field cname="activates_default" bits="1" type="guint" />
+      <field cname="cursor_visible" bits="1" type="guint" />
+      <field cname="in_click" bits="1" type="guint" />
+      <field cname="is_cell_renderer" bits="1" type="guint" />
+      <field cname="editing_canceled" bits="1" type="guint" />
+      <field cname="mouse_cursor_obscured" bits="1" type="guint" />
+      <field cname="button" type="guint" />
+      <field cname="blink_timeout" type="guint" />
+      <field cname="recompute_idle" type="guint" />
+      <field cname="scroll_offset" type="gint" />
+      <field cname="ascent" type="gint" />
+      <field cname="descent" type="gint" />
+      <field cname="text_size" type="guint16" />
+      <field cname="n_bytes" type="guint16" />
+      <field cname="preedit_length" type="guint16" />
+      <field cname="preedit_cursor" type="guint16" />
+      <field cname="dnd_position" type="gint" />
+      <field cname="drag_start_x" type="gint" />
+      <field cname="drag_start_y" type="gint" />
+      <field cname="invisible_char" type="gunichar" />
+      <field cname="width_chars" type="gint" />
+      <property name="CursorPosition" cname="cursor_position" type="gint" readable="true" />
+      <property name="SelectionBound" cname="selection_bound" type="gint" readable="true" />
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="MaxLength" cname="max_length" type="gint" readable="true" writeable="true" />
+      <property name="Visibility" cname="visibility" type="gboolean" readable="true" writeable="true" />
+      <property name="HasFrame" cname="has_frame" type="gboolean" readable="true" writeable="true" />
+      <property name="InvisibleChar" cname="invisible_char" type="unichar" readable="true" writeable="true" />
+      <property name="ActivatesDefault" cname="activates_default" type="gboolean" readable="true" writeable="true" />
+      <property name="WidthChars" cname="width_chars" type="gint" readable="true" writeable="true" />
+      <property name="ScrollOffset" cname="scroll_offset" type="gint" readable="true" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
       <signal name="PopulatePopup" cname="populate_popup" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
-          <parameter type="GtkMenu*" name="menu"/>
+          <parameter type="GtkEntry*" name="entry" />
+          <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </signal>
       <signal name="Activated" cname="activate" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
+          <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
       <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
-          <parameter type="GtkMovementStep" name="step"/>
-          <parameter type="gint" name="count"/>
-          <parameter type="gboolean" name="extend_selection"/>
+          <parameter type="GtkEntry*" name="entry" />
+          <parameter type="GtkMovementStep" name="step" />
+          <parameter type="gint" name="count" />
+          <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
       <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkEntry*" name="entry" />
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
       <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
-          <parameter type="GtkDeleteType" name="type"/>
-          <parameter type="gint" name="count"/>
+          <parameter type="GtkEntry*" name="entry" />
+          <parameter type="GtkDeleteType" name="type" />
+          <parameter type="gint" name="count" />
         </parameters>
       </signal>
       <signal name="ClipboardCut" cname="cut_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
+          <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
       <signal name="ClipboardCopied" cname="copy_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
+          <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
       <signal name="ClipboardPasted" cname="paste_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
+          <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
       <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkEntry*" name="entry"/>
+          <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
       <implements>
-        <interface cname="GtkEditable"/>
-        <interface cname="GtkCellEditable"/>
+        <interface cname="GtkEditable" />
+        <interface cname="GtkCellEditable" />
       </implements>
       <method name="GetActivatesDefault" cname="gtk_entry_get_activates_default">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetHasFrame" cname="gtk_entry_get_has_frame">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetInvisibleChar" cname="gtk_entry_get_invisible_char">
-        <return-type type="gunichar"/>
+        <return-type type="gunichar" />
       </method>
       <method name="GetLayout" cname="gtk_entry_get_layout">
-        <return-type type="PangoLayout*"/>
+        <return-type type="PangoLayout*" />
       </method>
       <method name="GetLayoutOffsets" cname="gtk_entry_get_layout_offsets">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="x"/>
-          <parameter type="gint*" name="y"/>
+          <parameter type="gint*" name="x" />
+          <parameter type="gint*" name="y" />
         </parameters>
       </method>
       <method name="GetMaxLength" cname="gtk_entry_get_max_length">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetText" cname="gtk_entry_get_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_entry_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisibility" cname="gtk_entry_get_visibility">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetWidthChars" cname="gtk_entry_get_width_chars">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
-      <constructor cname="gtk_entry_new"/>
+      <constructor cname="gtk_entry_new" />
       <method name="SetActivatesDefault" cname="gtk_entry_set_activates_default">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetHasFrame" cname="gtk_entry_set_has_frame">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetInvisibleChar" cname="gtk_entry_set_invisible_char">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gunichar" name="ch"/>
+          <parameter type="gunichar" name="ch" />
         </parameters>
       </method>
       <method name="SetMaxLength" cname="gtk_entry_set_max_length">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="max"/>
+          <parameter type="gint" name="max" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_entry_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="SetVisibility" cname="gtk_entry_set_visibility">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="visible"/>
+          <parameter type="gboolean" name="visible" />
         </parameters>
       </method>
       <method name="SetWidthChars" cname="gtk_entry_set_width_chars">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="n_chars"/>
+          <parameter type="gint" name="n_chars" />
         </parameters>
       </method>
     </object>
     <object name="EventBox" cname="GtkEventBox" parent="GtkBin">
       <method name="GetType" cname="gtk_event_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_event_box_new"/>
+      <constructor cname="gtk_event_box_new" />
     </object>
     <object name="FileSelection" cname="GtkFileSelection" parent="GtkDialog">
-      <field cname="dir_list" type="GtkWidget*"/>
-      <field cname="file_list" type="GtkWidget*"/>
-      <field cname="selection_entry" type="GtkWidget*"/>
-      <field cname="selection_text" type="GtkWidget*"/>
-      <field cname="main_vbox" type="GtkWidget*"/>
-      <field cname="ok_button" type="GtkWidget*"/>
-      <field cname="cancel_button" type="GtkWidget*"/>
-      <field cname="help_button" type="GtkWidget*"/>
-      <field cname="history_pulldown" type="GtkWidget*"/>
-      <field cname="history_menu" type="GtkWidget*"/>
-      <field cname="history_list" type="GList*"/>
-      <field cname="fileop_dialog" type="GtkWidget*"/>
-      <field cname="fileop_entry" type="GtkWidget*"/>
-      <field cname="fileop_file" type="gchar*"/>
-      <field cname="cmpl_state" type="gpointer"/>
-      <field cname="fileop_c_dir" type="GtkWidget*"/>
-      <field cname="fileop_del_file" type="GtkWidget*"/>
-      <field cname="fileop_ren_file" type="GtkWidget*"/>
-      <field cname="button_area" type="GtkWidget*"/>
-      <field cname="action_area" type="GtkWidget*"/>
-      <field cname="selected_names" type="GPtrArray*"/>
-      <field cname="last_selected" type="gchar*"/>
-      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true"/>
-      <property name="ShowFileops" cname="show_fileops" type="gboolean" readable="true" writeable="true"/>
-      <property name="SelectMultiple" cname="select_multiple" type="gboolean" readable="true" writeable="true"/>
+      <field cname="dir_list" type="GtkWidget*" />
+      <field cname="file_list" type="GtkWidget*" />
+      <field cname="selection_entry" type="GtkWidget*" />
+      <field cname="selection_text" type="GtkWidget*" />
+      <field cname="main_vbox" type="GtkWidget*" />
+      <field cname="ok_button" type="GtkWidget*" />
+      <field cname="cancel_button" type="GtkWidget*" />
+      <field cname="help_button" type="GtkWidget*" />
+      <field cname="history_pulldown" type="GtkWidget*" />
+      <field cname="history_menu" type="GtkWidget*" />
+      <field cname="history_list" type="GList*" />
+      <field cname="fileop_dialog" type="GtkWidget*" />
+      <field cname="fileop_entry" type="GtkWidget*" />
+      <field cname="fileop_file" type="gchar*" />
+      <field cname="cmpl_state" type="gpointer" />
+      <field cname="fileop_c_dir" type="GtkWidget*" />
+      <field cname="fileop_del_file" type="GtkWidget*" />
+      <field cname="fileop_ren_file" type="GtkWidget*" />
+      <field cname="button_area" type="GtkWidget*" />
+      <field cname="action_area" type="GtkWidget*" />
+      <field cname="selected_names" type="GPtrArray*" />
+      <field cname="last_selected" type="gchar*" />
+      <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true" />
+      <property name="ShowFileops" cname="show_fileops" type="gboolean" readable="true" writeable="true" />
+      <property name="SelectMultiple" cname="select_multiple" type="gboolean" readable="true" writeable="true" />
       <method name="Complete" cname="gtk_file_selection_complete">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="pattern"/>
+          <parameter type="const-gchar*" name="pattern" />
         </parameters>
       </method>
       <method name="GetFilename" cname="gtk_file_selection_get_filename">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetSelectMultiple" cname="gtk_file_selection_get_select_multiple">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSelections" cname="gtk_file_selection_get_selections" hidden="1">
-        <return-type type="gchar**"/>
+        <return-type type="gchar**" />
       </method>
       <method name="GetType" cname="gtk_file_selection_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="HideFileopButtons" cname="gtk_file_selection_hide_fileop_buttons">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <constructor cname="gtk_file_selection_new">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </constructor>
       <method name="SetFilename" cname="gtk_file_selection_set_filename">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetSelectMultiple" cname="gtk_file_selection_set_select_multiple">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="select_multiple"/>
+          <parameter type="gboolean" name="select_multiple" />
         </parameters>
       </method>
       <method name="ShowFileopButtons" cname="gtk_file_selection_show_fileop_buttons">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Fixed" cname="GtkFixed" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
+      <field cname="children" type="GList*" />
       <method name="GetHasWindow" cname="gtk_fixed_get_has_window">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_fixed_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Move" cname="gtk_fixed_move">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
-      <constructor cname="gtk_fixed_new"/>
+      <constructor cname="gtk_fixed_new" />
       <method name="Put" cname="gtk_fixed_put">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <method name="SetHasWindow" cname="gtk_fixed_set_has_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="has_window"/>
+          <parameter type="gboolean" name="has_window" />
         </parameters>
       </method>
     </object>
     <object name="FontSelection" cname="GtkFontSelection" parent="GtkVBox">
-      <field cname="font_entry" type="GtkWidget*"/>
-      <field cname="family_list" type="GtkWidget*"/>
-      <field cname="font_style_entry" type="GtkWidget*"/>
-      <field cname="face_list" type="GtkWidget*"/>
-      <field cname="size_entry" type="GtkWidget*"/>
-      <field cname="size_list" type="GtkWidget*"/>
-      <field cname="pixels_button" type="GtkWidget*"/>
-      <field cname="points_button" type="GtkWidget*"/>
-      <field cname="filter_button" type="GtkWidget*"/>
-      <field cname="preview_entry" type="GtkWidget*"/>
-      <field cname="family" type="PangoFontFamily*"/>
-      <field cname="face" type="PangoFontFace*"/>
-      <field cname="size" type="gint"/>
-      <field cname="font" type="GdkFont*"/>
-      <property name="FontName" cname="font_name" type="gchar*" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="GdkFont" readable="true"/>
-      <property name="PreviewText" cname="preview_text" type="gchar*" readable="true" writeable="true"/>
+      <field cname="font_entry" type="GtkWidget*" />
+      <field cname="family_list" type="GtkWidget*" />
+      <field cname="font_style_entry" type="GtkWidget*" />
+      <field cname="face_list" type="GtkWidget*" />
+      <field cname="size_entry" type="GtkWidget*" />
+      <field cname="size_list" type="GtkWidget*" />
+      <field cname="pixels_button" type="GtkWidget*" />
+      <field cname="points_button" type="GtkWidget*" />
+      <field cname="filter_button" type="GtkWidget*" />
+      <field cname="preview_entry" type="GtkWidget*" />
+      <field cname="family" type="PangoFontFamily*" />
+      <field cname="face" type="PangoFontFace*" />
+      <field cname="size" type="gint" />
+      <field cname="font" type="GdkFont*" />
+      <property name="FontName" cname="font_name" type="gchar*" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="GdkFont" readable="true" />
+      <property name="PreviewText" cname="preview_text" type="gchar*" readable="true" writeable="true" />
       <method name="GetFontName" cname="gtk_font_selection_get_font_name">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetPreviewText" cname="gtk_font_selection_get_preview_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_font_selection_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_font_selection_new"/>
+      <constructor cname="gtk_font_selection_new" />
       <method name="SetFontName" cname="gtk_font_selection_set_font_name">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="fontname"/>
+          <parameter type="const-gchar*" name="fontname" />
         </parameters>
       </method>
       <method name="SetPreviewText" cname="gtk_font_selection_set_preview_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
     </object>
     <object name="FontSelectionDialog" cname="GtkFontSelectionDialog" parent="GtkDialog">
-      <field cname="fontsel" type="GtkWidget*"/>
-      <field cname="main_vbox" type="GtkWidget*"/>
-      <field cname="action_area" type="GtkWidget*"/>
-      <field cname="ok_button" type="GtkWidget*"/>
-      <field cname="apply_button" type="GtkWidget*"/>
-      <field cname="cancel_button" type="GtkWidget*"/>
-      <field cname="dialog_width" type="gint"/>
-      <field cname="auto_resize" type="gboolean"/>
+      <field cname="fontsel" type="GtkWidget*" />
+      <field cname="main_vbox" type="GtkWidget*" />
+      <field cname="action_area" type="GtkWidget*" />
+      <field cname="ok_button" type="GtkWidget*" />
+      <field cname="apply_button" type="GtkWidget*" />
+      <field cname="cancel_button" type="GtkWidget*" />
+      <field cname="dialog_width" type="gint" />
+      <field cname="auto_resize" type="gboolean" />
       <method name="GetFontName" cname="gtk_font_selection_dialog_get_font_name">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetPreviewText" cname="gtk_font_selection_dialog_get_preview_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_font_selection_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_font_selection_dialog_new">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </constructor>
       <method name="SetFontName" cname="gtk_font_selection_dialog_set_font_name">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="fontname"/>
+          <parameter type="const-gchar*" name="fontname" />
         </parameters>
       </method>
       <method name="SetPreviewText" cname="gtk_font_selection_dialog_set_preview_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
     </object>
     <object name="Frame" cname="GtkFrame" parent="GtkBin" disabledefaultconstructor="1">
-      <field cname="label_widget" type="GtkWidget*"/>
-      <field cname="shadow_type" type="gint16"/>
-      <field cname="label_xalign" type="gfloat"/>
-      <field cname="label_yalign" type="gfloat"/>
-      <field cname="child_allocation" type="GtkAllocation"/>
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true"/>
-      <property name="LabelXalign" cname="label_xalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="LabelYalign" cname="label_yalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Shadow" cname="shadow" type="GtkShadowType" readable="true" writeable="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true"/>
-      <property name="LabelWidget" cname="label_widget" type="GtkWidget" readable="true" writeable="true"/>
+      <field cname="label_widget" type="GtkWidget*" />
+      <field cname="shadow_type" type="gint16" />
+      <field cname="label_xalign" type="gfloat" />
+      <field cname="label_yalign" type="gfloat" />
+      <field cname="child_allocation" type="GtkAllocation" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" />
+      <property name="LabelXalign" cname="label_xalign" type="gfloat" readable="true" writeable="true" />
+      <property name="LabelYalign" cname="label_yalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Shadow" cname="shadow" type="GtkShadowType" readable="true" writeable="true" />
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" />
+      <property name="LabelWidget" cname="label_widget" type="GtkWidget" readable="true" writeable="true" />
       <method name="GetLabel" cname="gtk_frame_get_label">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetLabelAlign" cname="gtk_frame_get_label_align" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat*" name="xalign"/>
-          <parameter type="gfloat*" name="yalign"/>
+          <parameter type="gfloat*" name="xalign" />
+          <parameter type="gfloat*" name="yalign" />
         </parameters>
       </method>
       <method name="GetLabelWidget" cname="gtk_frame_get_label_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetShadowType" cname="gtk_frame_get_shadow_type">
-        <return-type type="GtkShadowType"/>
+        <return-type type="GtkShadowType" />
       </method>
       <method name="GetType" cname="gtk_frame_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_frame_new">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetLabel" cname="gtk_frame_set_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </method>
       <method name="SetLabelAlign" cname="gtk_frame_set_label_align" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
         </parameters>
       </method>
       <method name="SetLabelWidget" cname="gtk_frame_set_label_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="label_widget"/>
+          <parameter type="GtkWidget*" name="label_widget" />
         </parameters>
       </method>
       <method name="SetShadowType" cname="gtk_frame_set_shadow_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkShadowType" name="type"/>
+          <parameter type="GtkShadowType" name="type" />
         </parameters>
       </method>
     </object>
     <object name="GammaCurve" cname="GtkGammaCurve" parent="GtkVBox">
-      <field cname="table" type="GtkWidget*"/>
-      <field cname="curve" type="GtkWidget*"/>
-      <field cname="button" array_len="5" type="GtkWidget*"/>
-      <field cname="gamma" type="gfloat"/>
-      <field cname="gamma_dialog" type="GtkWidget*"/>
-      <field cname="gamma_text" type="GtkWidget*"/>
+      <field cname="table" type="GtkWidget*" />
+      <field cname="curve" type="GtkWidget*" />
+      <field cname="button" array_len="5" type="GtkWidget*" />
+      <field cname="gamma" type="gfloat" />
+      <field cname="gamma_dialog" type="GtkWidget*" />
+      <field cname="gamma_text" type="GtkWidget*" />
       <method name="GetType" cname="gtk_gamma_curve_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_gamma_curve_new"/>
+      <constructor cname="gtk_gamma_curve_new" />
     </object>
     <object name="HandleBox" cname="GtkHandleBox" parent="GtkBin">
-      <field cname="bin_window" type="GdkWindow*"/>
-      <field cname="float_window" type="GdkWindow*"/>
-      <field cname="shadow_type" type="GtkShadowType"/>
-      <field cname="handle_position" bits="2" type="guint"/>
-      <field cname="float_window_mapped" bits="1" type="guint"/>
-      <field cname="child_detached" bits="1" type="guint"/>
-      <field cname="in_drag" bits="1" type="guint"/>
-      <field cname="shrink_on_detach" bits="1" type="guint"/>
-      <field cname="snap_edge" bits="3" type="signed"/>
-      <field cname="deskoff_x" type="gint"/>
-      <field cname="deskoff_y" type="gint"/>
-      <field cname="attach_allocation" type="GtkAllocation"/>
-      <field cname="float_allocation" type="GtkAllocation"/>
-      <property name="Shadow" cname="shadow" type="GtkShadowType" readable="true" writeable="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" hidden="1"/>
-      <property name="HandlePosition" cname="handle_position" type="GtkPositionType" readable="true" writeable="true"/>
-      <property name="SnapEdge" cname="snap_edge" type="GtkPositionType" readable="true" writeable="true"/>
-      <property name="SnapEdgeSet" cname="snap_edge_set" type="gboolean" readable="true" writeable="true"/>
+      <field cname="bin_window" type="GdkWindow*" />
+      <field cname="float_window" type="GdkWindow*" />
+      <field cname="shadow_type" type="GtkShadowType" />
+      <field cname="handle_position" bits="2" type="guint" />
+      <field cname="float_window_mapped" bits="1" type="guint" />
+      <field cname="child_detached" bits="1" type="guint" />
+      <field cname="in_drag" bits="1" type="guint" />
+      <field cname="shrink_on_detach" bits="1" type="guint" />
+      <field cname="snap_edge" bits="3" type="signed" />
+      <field cname="deskoff_x" type="gint" />
+      <field cname="deskoff_y" type="gint" />
+      <field cname="attach_allocation" type="GtkAllocation" />
+      <field cname="float_allocation" type="GtkAllocation" />
+      <property name="Shadow" cname="shadow" type="GtkShadowType" readable="true" writeable="true" />
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" hidden="1" />
+      <property name="HandlePosition" cname="handle_position" type="GtkPositionType" readable="true" writeable="true" />
+      <property name="SnapEdge" cname="snap_edge" type="GtkPositionType" readable="true" writeable="true" />
+      <property name="SnapEdgeSet" cname="snap_edge_set" type="gboolean" readable="true" writeable="true" />
       <signal name="ChildAttached" cname="child_attached" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHandleBox*" name="handle_box"/>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkHandleBox*" name="handle_box" />
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </signal>
       <signal name="ChildDetached" cname="child_detached" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHandleBox*" name="handle_box"/>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkHandleBox*" name="handle_box" />
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </signal>
       <method name="GetHandlePosition" cname="gtk_handle_box_get_handle_position">
-        <return-type type="GtkPositionType"/>
+        <return-type type="GtkPositionType" />
       </method>
       <method name="GetShadowType" cname="gtk_handle_box_get_shadow_type">
-        <return-type type="GtkShadowType"/>
+        <return-type type="GtkShadowType" />
       </method>
       <method name="GetSnapEdge" cname="gtk_handle_box_get_snap_edge">
-        <return-type type="GtkPositionType"/>
+        <return-type type="GtkPositionType" />
       </method>
       <method name="GetType" cname="gtk_handle_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_handle_box_new"/>
+      <constructor cname="gtk_handle_box_new" />
       <method name="SetHandlePosition" cname="gtk_handle_box_set_handle_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPositionType" name="position"/>
+          <parameter type="GtkPositionType" name="position" />
         </parameters>
       </method>
       <method name="SetShadowType" cname="gtk_handle_box_set_shadow_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkShadowType" name="type"/>
+          <parameter type="GtkShadowType" name="type" />
         </parameters>
       </method>
       <method name="SetSnapEdge" cname="gtk_handle_box_set_snap_edge">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPositionType" name="edge"/>
+          <parameter type="GtkPositionType" name="edge" />
         </parameters>
       </method>
     </object>
     <object name="HBox" cname="GtkHBox" parent="GtkBox">
       <method name="GetType" cname="gtk_hbox_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_hbox_new">
         <parameters>
-          <parameter type="gboolean" name="homogeneous"/>
-          <parameter type="gint" name="spacing"/>
+          <parameter type="gboolean" name="homogeneous" />
+          <parameter type="gint" name="spacing" />
         </parameters>
       </constructor>
     </object>
     <object name="HButtonBox" cname="GtkHButtonBox" parent="GtkButtonBox">
       <method name="GetType" cname="gtk_hbutton_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_hbutton_box_new"/>
+      <constructor cname="gtk_hbutton_box_new" />
     </object>
     <object name="HPaned" cname="GtkHPaned" parent="GtkPaned">
       <method name="GetType" cname="gtk_hpaned_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_hpaned_new"/>
+      <constructor cname="gtk_hpaned_new" />
     </object>
     <object name="HRuler" cname="GtkHRuler" parent="GtkRuler">
       <method name="GetType" cname="gtk_hruler_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_hruler_new"/>
+      <constructor cname="gtk_hruler_new" />
     </object>
     <object name="HScale" cname="GtkHScale" parent="GtkScale">
       <method name="GetType" cname="gtk_hscale_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_hscale_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </constructor>
       <constructor cname="gtk_hscale_new_with_range">
         <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
-          <parameter type="gdouble" name="step"/>
+          <parameter type="gdouble" name="min" />
+          <parameter type="gdouble" name="max" />
+          <parameter type="gdouble" name="step" />
         </parameters>
       </constructor>
     </object>
     <object name="HScrollbar" cname="GtkHScrollbar" parent="GtkScrollbar">
       <method name="GetType" cname="gtk_hscrollbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_hscrollbar_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </constructor>
     </object>
     <object name="HSeparator" cname="GtkHSeparator" parent="GtkSeparator">
       <method name="GetType" cname="gtk_hseparator_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_hseparator_new"/>
+      <constructor cname="gtk_hseparator_new" />
     </object>
     <object name="HSV" cname="GtkHSV" parent="GtkWidget">
-      <field cname="priv" type="gpointer"/>
+      <field cname="priv" type="gpointer" />
       <signal name="Changed" cname="changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHSV*" name="hsv"/>
+          <parameter type="GtkHSV*" name="hsv" />
         </parameters>
       </signal>
       <signal name="Move" cname="move" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHSV*" name="hsv"/>
-          <parameter type="GtkDirectionType" name="type"/>
+          <parameter type="GtkHSV*" name="hsv" />
+          <parameter type="GtkDirectionType" name="type" />
         </parameters>
       </signal>
       <method name="GetColor" cname="gtk_hsv_get_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble*" name="h"/>
-          <parameter type="gdouble*" name="s"/>
-          <parameter type="gdouble*" name="v"/>
+          <parameter type="gdouble*" name="h" />
+          <parameter type="gdouble*" name="s" />
+          <parameter type="gdouble*" name="v" />
         </parameters>
       </method>
       <method name="GetMetrics" cname="gtk_hsv_get_metrics">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="size"/>
-          <parameter type="gint*" name="ring_width"/>
+          <parameter type="gint*" name="size" />
+          <parameter type="gint*" name="ring_width" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_hsv_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="IsAdjusting" cname="gtk_hsv_is_adjusting">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
-      <constructor cname="gtk_hsv_new"/>
+      <constructor cname="gtk_hsv_new" />
       <method name="SetColor" cname="gtk_hsv_set_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="double" name="h"/>
-          <parameter type="double" name="s"/>
-          <parameter type="double" name="v"/>
+          <parameter type="double" name="h" />
+          <parameter type="double" name="s" />
+          <parameter type="double" name="v" />
         </parameters>
       </method>
       <method name="SetMetrics" cname="gtk_hsv_set_metrics">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="size"/>
-          <parameter type="gint" name="ring_width"/>
+          <parameter type="gint" name="size" />
+          <parameter type="gint" name="ring_width" />
         </parameters>
       </method>
       <method name="ToRgb" cname="gtk_hsv_to_rgb" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="h"/>
-          <parameter type="gdouble" name="s"/>
-          <parameter type="gdouble" name="v"/>
-          <parameter type="gdouble*" name="r"/>
-          <parameter type="gdouble*" name="g"/>
-          <parameter type="gdouble*" name="b"/>
+          <parameter type="gdouble" name="h" />
+          <parameter type="gdouble" name="s" />
+          <parameter type="gdouble" name="v" />
+          <parameter type="gdouble*" name="r" />
+          <parameter type="gdouble*" name="g" />
+          <parameter type="gdouble*" name="b" />
         </parameters>
       </method>
     </object>
     <object name="IconFactory" cname="GtkIconFactory" parent="GObject">
-      <field cname="icons" type="GHashTable*"/>
+      <field cname="icons" type="GHashTable*" />
       <method name="Add" cname="gtk_icon_factory_add">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkIconSet*" name="icon_set"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkIconSet*" name="icon_set" />
         </parameters>
       </method>
       <method name="AddDefault" cname="gtk_icon_factory_add_default">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_icon_factory_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Lookup" cname="gtk_icon_factory_lookup">
-        <return-type type="GtkIconSet*"/>
+        <return-type type="GtkIconSet*" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="const-gchar*" name="stock_id" />
         </parameters>
       </method>
       <method name="LookupDefault" cname="gtk_icon_factory_lookup_default" shared="true">
-        <return-type type="GtkIconSet*"/>
+        <return-type type="GtkIconSet*" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="const-gchar*" name="stock_id" />
         </parameters>
       </method>
-      <constructor cname="gtk_icon_factory_new"/>
+      <constructor cname="gtk_icon_factory_new" />
       <method name="RemoveDefault" cname="gtk_icon_factory_remove_default">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Image" cname="GtkImage" parent="GtkMisc">
-      <field cname="storage_type" type="GtkImageType"/>
-      <field cname="pixmap" type="union{GtkImagePixmapData"/>
-      <field cname="image" type="GtkImageImageData"/>
-      <field cname="pixbuf" type="GtkImagePixbufData"/>
-      <field cname="stock" type="GtkImageStockData"/>
-      <field cname="icon_set" type="GtkImageIconSetData"/>
-      <field cname="anim" type="GtkImageAnimationData"/>
-      <field cname="data" type="}"/>
-      <field cname="mask" type="GdkBitmap*"/>
-      <field cname="icon_size" type="GtkIconSize"/>
-      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="Pixmap" cname="pixmap" type="GdkPixmap" readable="true" writeable="true"/>
-      <property name="Image" cname="image" type="GdkImage" readable="true" writeable="true"/>
-      <property name="Mask" cname="mask" type="GdkPixmap" readable="true" writeable="true"/>
-      <property name="File" cname="file" type="gchar*" writeable="true"/>
-      <property name="Stock" cname="stock" type="gchar*" readable="true" writeable="true"/>
-      <property name="IconSet" cname="icon_set" type="GtkIconSet" readable="true" writeable="true"/>
-      <property name="IconSize" cname="icon_size" type="gint" readable="true" writeable="true"/>
-      <property name="PixbufAnimation" cname="pixbuf_animation" type="GdkPixbufAnimation" readable="true" writeable="true"/>
-      <property name="StorageType" cname="storage_type" type="GtkImageType" readable="true"/>
+      <field cname="storage_type" type="GtkImageType" />
+      <field cname="pixmap" type="union{GtkImagePixmapData" />
+      <field cname="image" type="GtkImageImageData" />
+      <field cname="pixbuf" type="GtkImagePixbufData" />
+      <field cname="stock" type="GtkImageStockData" />
+      <field cname="icon_set" type="GtkImageIconSetData" />
+      <field cname="anim" type="GtkImageAnimationData" />
+      <field cname="data" type="}" />
+      <field cname="mask" type="GdkBitmap*" />
+      <field cname="icon_size" type="GtkIconSize" />
+      <property name="Pixbuf" cname="pixbuf" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="Pixmap" cname="pixmap" type="GdkPixmap" readable="true" writeable="true" />
+      <property name="Image" cname="image" type="GdkImage" readable="true" writeable="true" />
+      <property name="Mask" cname="mask" type="GdkPixmap" readable="true" writeable="true" />
+      <property name="File" cname="file" type="gchar*" writeable="true" />
+      <property name="Stock" cname="stock" type="gchar*" readable="true" writeable="true" />
+      <property name="IconSet" cname="icon_set" type="GtkIconSet" readable="true" writeable="true" />
+      <property name="IconSize" cname="icon_size" type="gint" readable="true" writeable="true" />
+      <property name="PixbufAnimation" cname="pixbuf_animation" type="GdkPixbufAnimation" readable="true" writeable="true" />
+      <property name="StorageType" cname="storage_type" type="GtkImageType" readable="true" />
       <method name="GetAnimation" cname="gtk_image_get_animation">
-        <return-type type="GdkPixbufAnimation*"/>
+        <return-type type="GdkPixbufAnimation*" />
       </method>
       <method name="GetIconSet" cname="gtk_image_get_icon_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSet**" name="icon_set"/>
-          <parameter type="GtkIconSize*" name="size"/>
+          <parameter type="GtkIconSet**" name="icon_set" />
+          <parameter type="GtkIconSize*" name="size" />
         </parameters>
       </method>
       <method name="GetImage" cname="gtk_image_get_image">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkImage**" name="gdk_image"/>
-          <parameter type="GdkBitmap**" name="mask"/>
+          <parameter type="GdkImage**" name="gdk_image" />
+          <parameter type="GdkBitmap**" name="mask" />
         </parameters>
       </method>
       <method name="GetPixbuf" cname="gtk_image_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
       </method>
       <method name="GetPixmap" cname="gtk_image_get_pixmap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
+          <parameter type="GdkPixmap**" name="pixmap" />
+          <parameter type="GdkBitmap**" name="mask" />
         </parameters>
       </method>
       <method name="GetStock" cname="gtk_image_get_stock">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gchar**" name="stock_id"/>
-          <parameter type="GtkIconSize*" name="size"/>
+          <parameter type="gchar**" name="stock_id" />
+          <parameter type="GtkIconSize*" name="size" />
         </parameters>
       </method>
       <method name="GetStorageType" cname="gtk_image_get_storage_type">
-        <return-type type="GtkImageType"/>
+        <return-type type="GtkImageType" />
       </method>
       <method name="GetType" cname="gtk_image_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_image_new"/>
+      <constructor cname="gtk_image_new" />
       <constructor cname="gtk_image_new_from_animation">
         <parameters>
-          <parameter type="GdkPixbufAnimation*" name="animation"/>
+          <parameter type="GdkPixbufAnimation*" name="animation" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_file">
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_icon_set">
         <parameters>
-          <parameter type="GtkIconSet*" name="icon_set"/>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="GtkIconSet*" name="icon_set" />
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_image">
         <parameters>
-          <parameter type="GdkImage*" name="image"/>
-          <parameter type="GdkBitmap*" name="mask"/>
+          <parameter type="GdkImage*" name="image" />
+          <parameter type="GdkBitmap*" name="mask" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_pixbuf">
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_pixmap">
         <parameters>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
+          <parameter type="GdkPixmap*" name="pixmap" />
+          <parameter type="GdkBitmap*" name="mask" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_new_from_stock">
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </constructor>
       <method name="SetFromAnimation" cname="gtk_image_set_from_animation">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbufAnimation*" name="animation"/>
+          <parameter type="GdkPixbufAnimation*" name="animation" />
         </parameters>
       </method>
       <method name="SetFromFile" cname="gtk_image_set_from_file">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetFromIconSet" cname="gtk_image_set_from_icon_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSet*" name="icon_set"/>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="GtkIconSet*" name="icon_set" />
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </method>
       <method name="SetFromImage" cname="gtk_image_set_from_image">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkImage*" name="gdk_image"/>
-          <parameter type="GdkBitmap*" name="mask"/>
+          <parameter type="GdkImage*" name="gdk_image" />
+          <parameter type="GdkBitmap*" name="mask" />
         </parameters>
       </method>
       <method name="SetFromPixbuf" cname="gtk_image_set_from_pixbuf">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </method>
       <method name="SetFromPixmap" cname="gtk_image_set_from_pixmap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask" null_ok="1"/>
+          <parameter type="GdkPixmap*" name="pixmap" />
+          <parameter type="GdkBitmap*" name="mask" null_ok="1" />
         </parameters>
       </method>
       <method name="SetFromStock" cname="gtk_image_set_from_stock">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </method>
     </object>
     <object name="ImageMenuItem" cname="GtkImageMenuItem" parent="GtkMenuItem">
-      <field cname="image" type="GtkWidget*"/>
-      <property name="Image" cname="image" type="GtkWidget" readable="true" writeable="true"/>
+      <field cname="image" type="GtkWidget*" />
+      <property name="Image" cname="image" type="GtkWidget" readable="true" writeable="true" />
       <method name="GetImage" cname="gtk_image_menu_item_get_image">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gtk_image_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_image_menu_item_new"/>
+      <constructor cname="gtk_image_menu_item_new" />
       <constructor cname="gtk_image_menu_item_new_from_stock">
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_menu_item_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_image_menu_item_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetImage" cname="gtk_image_menu_item_set_image">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="image"/>
+          <parameter type="GtkWidget*" name="image" />
         </parameters>
       </method>
     </object>
     <object name="IMContext" cname="GtkIMContext" parent="GObject">
       <signal name="PreeditStart" cname="preedit_start" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
+          <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
       <signal name="PreeditEnd" cname="preedit_end" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
+          <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
       <signal name="PreeditChanged" cname="preedit_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
+          <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
       <signal name="Commit" cname="commit" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkIMContext*" name="context" />
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
       <signal name="RetrieveSurrounding" cname="retrieve_surrounding" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
+          <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
       <signal name="SurroundingDeleted" cname="delete_surrounding" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkIMContext*" name="context"/>
-          <parameter type="gint" name="offset"/>
-          <parameter type="gint" name="n_chars"/>
+          <parameter type="GtkIMContext*" name="context" />
+          <parameter type="gint" name="offset" />
+          <parameter type="gint" name="n_chars" />
         </parameters>
       </signal>
       <method name="DeleteSurrounding" cname="gtk_im_context_delete_surrounding">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="offset"/>
-          <parameter type="gint" name="n_chars"/>
+          <parameter type="gint" name="offset" />
+          <parameter type="gint" name="n_chars" />
         </parameters>
       </method>
       <method name="FilterKeypress" cname="gtk_im_context_filter_keypress">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkEventKey*" name="event"/>
+          <parameter type="GdkEventKey*" name="event" />
         </parameters>
       </method>
       <method name="FocusIn" cname="gtk_im_context_focus_in">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="FocusOut" cname="gtk_im_context_focus_out">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetPreeditString" cname="gtk_im_context_get_preedit_string">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gchar**" name="str"/>
-          <parameter type="PangoAttrList**" name="attrs"/>
-          <parameter type="gint*" name="cursor_pos"/>
+          <parameter type="gchar**" name="str" />
+          <parameter type="PangoAttrList**" name="attrs" />
+          <parameter type="gint*" name="cursor_pos" />
         </parameters>
       </method>
       <method name="GetSurrounding" cname="gtk_im_context_get_surrounding">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gchar**" name="text"/>
-          <parameter type="gint*" name="cursor_index"/>
+          <parameter type="gchar**" name="text" />
+          <parameter type="gint*" name="cursor_index" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_im_context_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Reset" cname="gtk_im_context_reset">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetClientWindow" cname="gtk_im_context_set_client_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
+          <parameter type="GdkWindow*" name="window" />
         </parameters>
       </method>
       <method name="SetCursorLocation" cname="gtk_im_context_set_cursor_location">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkRectangle*" name="area"/>
+          <parameter type="GdkRectangle*" name="area" />
         </parameters>
       </method>
       <method name="SetSurrounding" cname="gtk_im_context_set_surrounding">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
-          <parameter type="gint" name="cursor_index"/>
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
+          <parameter type="gint" name="cursor_index" />
         </parameters>
       </method>
       <method name="SetUsePreedit" cname="gtk_im_context_set_use_preedit">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="use_preedit"/>
+          <parameter type="gboolean" name="use_preedit" />
         </parameters>
       </method>
     </object>
     <object name="IMContextSimple" cname="GtkIMContextSimple" parent="GtkIMContext">
-      <field cname="tables" type="GSList*"/>
-      <field cname="compose_buffer" array_len="GTK_MAX_COMPOSE_LEN + 1" type="guint"/>
-      <field cname="tentative_match" type="gunichar"/>
-      <field cname="tentative_match_len" type="gint"/>
-      <field cname="in_hex_sequence" bits="1" type="guint"/>
+      <field cname="tables" type="GSList*" />
+      <field cname="compose_buffer" array_len="GTK_MAX_COMPOSE_LEN + 1" type="guint" />
+      <field cname="tentative_match" type="gunichar" />
+      <field cname="tentative_match_len" type="gint" />
+      <field cname="in_hex_sequence" bits="1" type="guint" />
       <method name="AddTable" cname="gtk_im_context_simple_add_table">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint16*" name="data"/>
-          <parameter type="gint" name="max_seq_len"/>
-          <parameter type="gint" name="n_seqs"/>
+          <parameter type="guint16*" name="data" />
+          <parameter type="gint" name="max_seq_len" />
+          <parameter type="gint" name="n_seqs" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_im_context_simple_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_im_context_simple_new"/>
+      <constructor cname="gtk_im_context_simple_new" />
     </object>
     <object name="IMMulticontext" cname="GtkIMMulticontext" parent="GtkIMContext">
-      <field cname="slave" type="GtkIMContext*"/>
-      <field cname="client_window" type="GdkWindow*"/>
-      <field cname="context_id" type="const-gchar*"/>
+      <field cname="slave" type="GtkIMContext*" />
+      <field cname="client_window" type="GdkWindow*" />
+      <field cname="context_id" type="const-gchar*" />
       <method name="AppendMenuitems" cname="gtk_im_multicontext_append_menuitems">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menushell"/>
+          <parameter type="GtkMenuShell*" name="menushell" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_im_multicontext_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_im_multicontext_new"/>
+      <constructor cname="gtk_im_multicontext_new" />
     </object>
     <object name="InputDialog" cname="GtkInputDialog" parent="GtkDialog">
-      <field cname="axis_list" type="GtkWidget*"/>
-      <field cname="axis_listbox" type="GtkWidget*"/>
-      <field cname="mode_optionmenu" type="GtkWidget*"/>
-      <field cname="close_button" type="GtkWidget*"/>
-      <field cname="save_button" type="GtkWidget*"/>
-      <field cname="axis_items" array_len="GDK_AXIS_LAST" type="GtkWidget*"/>
-      <field cname="current_device" type="GdkDevice*"/>
-      <field cname="keys_list" type="GtkWidget*"/>
-      <field cname="keys_listbox" type="GtkWidget*"/>
+      <field cname="axis_list" type="GtkWidget*" />
+      <field cname="axis_listbox" type="GtkWidget*" />
+      <field cname="mode_optionmenu" type="GtkWidget*" />
+      <field cname="close_button" type="GtkWidget*" />
+      <field cname="save_button" type="GtkWidget*" />
+      <field cname="axis_items" array_len="GDK_AXIS_LAST" type="GtkWidget*" />
+      <field cname="current_device" type="GdkDevice*" />
+      <field cname="keys_list" type="GtkWidget*" />
+      <field cname="keys_listbox" type="GtkWidget*" />
       <signal name="EnableDevice" cname="enable_device" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkInputDialog*" name="inputd"/>
-          <parameter type="GdkDevice*" name="device"/>
+          <parameter type="GtkInputDialog*" name="inputd" />
+          <parameter type="GdkDevice*" name="device" />
         </parameters>
       </signal>
       <signal name="DisableDevice" cname="disable_device" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkInputDialog*" name="inputd"/>
-          <parameter type="GdkDevice*" name="device"/>
+          <parameter type="GtkInputDialog*" name="inputd" />
+          <parameter type="GdkDevice*" name="device" />
         </parameters>
       </signal>
       <method name="GetType" cname="gtk_input_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_input_dialog_new"/>
+      <constructor cname="gtk_input_dialog_new" />
     </object>
     <object name="Invisible" cname="GtkInvisible" parent="GtkWidget">
-      <field cname="has_user_ref_count" type="gboolean"/>
-      <field cname="screen" type="GdkScreen*"/>
-      <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" new_flag="1"/>
+      <field cname="has_user_ref_count" type="gboolean" />
+      <field cname="screen" type="GdkScreen*" />
+      <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" new_flag="1" />
       <method name="GetScreen" cname="gtk_invisible_get_screen">
-        <return-type type="GdkScreen*"/>
+        <return-type type="GdkScreen*" />
       </method>
       <method name="GetType" cname="gtk_invisible_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_invisible_new"/>
+      <constructor cname="gtk_invisible_new" />
       <constructor cname="gtk_invisible_new_for_screen">
         <parameters>
-          <parameter type="GdkScreen*" name="screen"/>
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </constructor>
       <method name="SetScreen" cname="gtk_invisible_set_screen">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkScreen*" name="screen"/>
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </method>
     </object>
     <object name="Item" cname="GtkItem" parent="GtkBin">
       <signal name="Selected" cname="select" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItem*" name="item"/>
+          <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
       <signal name="Deselected" cname="deselect" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItem*" name="item"/>
+          <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
       <signal name="Toggled" cname="toggle" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItem*" name="item"/>
+          <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
       <method name="Deselect" cname="gtk_item_deselect">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Select" cname="gtk_item_select">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Toggle" cname="gtk_item_toggle">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="ItemFactory" cname="GtkItemFactory" parent="GtkObject">
-      <field cname="path" type="gchar*"/>
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="items" type="GSList*"/>
-      <field cname="translate_func" type="GtkTranslateFunc"/>
-      <field cname="translate_data" type="gpointer"/>
-      <field cname="translate_notify" type="GtkDestroyNotify"/>
+      <field cname="path" type="gchar*" />
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="items" type="GSList*" />
+      <field cname="translate_func" type="GtkTranslateFunc" />
+      <field cname="translate_data" type="gpointer" />
+      <field cname="translate_notify" type="GtkDestroyNotify" />
       <method name="AddForeign" cname="gtk_item_factory_add_foreign" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="accel_widget"/>
-          <parameter type="const-gchar*" name="full_path"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
+          <parameter type="GtkWidget*" name="accel_widget" />
+          <parameter type="const-gchar*" name="full_path" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
         </parameters>
       </method>
       <method name="Construct" cname="gtk_item_factory_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GType" name="container_type"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GType" name="container_type" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="CreateItem" cname="gtk_item_factory_create_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItemFactoryEntry*" name="entry"/>
-          <parameter type="gpointer" name="callback_data"/>
-          <parameter type="guint" name="callback_type"/>
+          <parameter type="GtkItemFactoryEntry*" name="entry" />
+          <parameter type="gpointer" name="callback_data" />
+          <parameter type="guint" name="callback_type" />
         </parameters>
       </method>
       <method name="CreateItems" cname="gtk_item_factory_create_items">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="n_entries"/>
-          <parameter type="GtkItemFactoryEntry*" name="entries"/>
-          <parameter type="gpointer" name="callback_data"/>
+          <parameter type="guint" name="n_entries" />
+          <parameter type="GtkItemFactoryEntry*" name="entries" />
+          <parameter type="gpointer" name="callback_data" />
         </parameters>
       </method>
       <method name="DeleteEntries" cname="gtk_item_factory_delete_entries">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="n_entries"/>
-          <parameter type="GtkItemFactoryEntry*" name="entries"/>
+          <parameter type="guint" name="n_entries" />
+          <parameter type="GtkItemFactoryEntry*" name="entries" />
         </parameters>
       </method>
       <method name="DeleteEntry" cname="gtk_item_factory_delete_entry">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkItemFactoryEntry*" name="entry"/>
+          <parameter type="GtkItemFactoryEntry*" name="entry" />
         </parameters>
       </method>
       <method name="DeleteItem" cname="gtk_item_factory_delete_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
+          <parameter type="const-gchar*" name="path" />
         </parameters>
       </method>
       <method name="FromWidget" cname="gtk_item_factory_from_widget" shared="true">
-        <return-type type="GtkItemFactory*"/>
+        <return-type type="GtkItemFactory*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="GetItem" cname="gtk_item_factory_get_item">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
+          <parameter type="const-gchar*" name="path" />
         </parameters>
       </method>
       <method name="GetItem" cname="gtk_item_factory_get_item_by_action">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="guint" name="action"/>
+          <parameter type="guint" name="action" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_item_factory_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetWidget" cname="gtk_item_factory_get_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
+          <parameter type="const-gchar*" name="path" />
         </parameters>
       </method>
       <method name="GetWidget" cname="gtk_item_factory_get_widget_by_action">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="guint" name="action"/>
+          <parameter type="guint" name="action" />
         </parameters>
       </method>
       <constructor cname="gtk_item_factory_new">
         <parameters>
-          <parameter type="GType" name="container_type"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GtkAccelGroup*" name="accel_group" null_ok="1"/>
+          <parameter type="GType" name="container_type" />
+          <parameter type="const-gchar*" name="path" />
+          <parameter type="GtkAccelGroup*" name="accel_group" null_ok="1" />
         </parameters>
       </constructor>
       <method name="PathFromWidget" cname="gtk_item_factory_path_from_widget" shared="true">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="Popup" cname="gtk_item_factory_popup">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="x"/>
-          <parameter type="guint" name="y"/>
-          <parameter type="guint" name="mouse_button"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="guint" name="x" />
+          <parameter type="guint" name="y" />
+          <parameter type="guint" name="mouse_button" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="PopupData" cname="gtk_item_factory_popup_data">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
       </method>
       <method name="PopupDataFromWidget" cname="gtk_item_factory_popup_data_from_widget" shared="true">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="PopupWithData" cname="gtk_item_factory_popup_with_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="popup_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
-          <parameter type="guint" name="x"/>
-          <parameter type="guint" name="y"/>
-          <parameter type="guint" name="mouse_button"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="gpointer" name="popup_data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
+          <parameter type="guint" name="x" />
+          <parameter type="guint" name="y" />
+          <parameter type="guint" name="mouse_button" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="SetTranslateFunc" cname="gtk_item_factory_set_translate_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTranslateFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="notify"/>
+          <parameter type="GtkTranslateFunc" name="func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="notify" />
         </parameters>
       </method>
     </object>
     <object name="Label" cname="GtkLabel" parent="GtkMisc">
-      <field cname="label" type="gchar*"/>
-      <field cname="jtype" bits="2" type="guint"/>
-      <field cname="wrap" bits="1" type="guint"/>
-      <field cname="use_underline" bits="1" type="guint"/>
-      <field cname="use_markup" bits="1" type="guint"/>
-      <field cname="mnemonic_keyval" type="guint"/>
-      <field cname="text" type="gchar*"/>
-      <field cname="attrs" type="PangoAttrList*"/>
-      <field cname="effective_attrs" type="PangoAttrList*"/>
-      <field cname="layout" type="PangoLayout*"/>
-      <field cname="mnemonic_widget" type="GtkWidget*"/>
-      <field cname="mnemonic_window" type="GtkWindow*"/>
-      <field cname="select_info" type="GtkLabelSelectionInfo*"/>
+      <field cname="label" type="gchar*" />
+      <field cname="jtype" bits="2" type="guint" />
+      <field cname="wrap" bits="1" type="guint" />
+      <field cname="use_underline" bits="1" type="guint" />
+      <field cname="use_markup" bits="1" type="guint" />
+      <field cname="mnemonic_keyval" type="guint" />
+      <field cname="text" type="gchar*" />
+      <field cname="attrs" type="PangoAttrList*" />
+      <field cname="effective_attrs" type="PangoAttrList*" />
+      <field cname="layout" type="PangoLayout*" />
+      <field cname="mnemonic_widget" type="GtkWidget*" />
+      <field cname="mnemonic_window" type="GtkWindow*" />
+      <field cname="select_info" type="GtkLabelSelectionInfo*" />
       <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkLabel*" name="label"/>
-          <parameter type="GtkMovementStep" name="step"/>
-          <parameter type="gint" name="count"/>
-          <parameter type="gboolean" name="extend_selection"/>
+          <parameter type="GtkLabel*" name="label" />
+          <parameter type="GtkMovementStep" name="step" />
+          <parameter type="gint" name="count" />
+          <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
       <signal name="CopyClipboard" cname="copy_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkLabel*" name="label"/>
+          <parameter type="GtkLabel*" name="label" />
         </parameters>
       </signal>
       <signal name="PopulatePopup" cname="populate_popup" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkLabel*" name="label"/>
-          <parameter type="GtkMenu*" name="menu"/>
+          <parameter type="GtkLabel*" name="label" />
+          <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </signal>
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true"/>
-      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true"/>
-      <property name="UseMarkup" cname="use_markup" type="gboolean" readable="true" writeable="true"/>
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true"/>
-      <property name="Justify" cname="justify" type="GtkJustification" readable="true" writeable="true"/>
-      <property name="Pattern" cname="pattern" type="gchar*" writeable="true"/>
-      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true"/>
-      <property name="Selectable" cname="selectable" type="gboolean" readable="true" writeable="true"/>
-      <property name="MnemonicKeyval" cname="mnemonic_keyval" type="guint" readable="true"/>
-      <property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" readable="true" writeable="true"/>
-      <property name="CursorPosition" cname="cursor_position" type="gint" readable="true"/>
-      <property name="SelectionBound" cname="selection_bound" type="gint" readable="true"/>
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" />
+      <property name="Attributes" cname="attributes" type="PangoAttrList" readable="true" writeable="true" />
+      <property name="UseMarkup" cname="use_markup" type="gboolean" readable="true" writeable="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" />
+      <property name="Justify" cname="justify" type="GtkJustification" readable="true" writeable="true" />
+      <property name="Pattern" cname="pattern" type="gchar*" writeable="true" />
+      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true" />
+      <property name="Selectable" cname="selectable" type="gboolean" readable="true" writeable="true" />
+      <property name="MnemonicKeyval" cname="mnemonic_keyval" type="guint" readable="true" />
+      <property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" readable="true" writeable="true" />
+      <property name="CursorPosition" cname="cursor_position" type="gint" readable="true" />
+      <property name="SelectionBound" cname="selection_bound" type="gint" readable="true" />
       <method name="GetAttributes" cname="gtk_label_get_attributes">
-        <return-type type="PangoAttrList*"/>
+        <return-type type="PangoAttrList*" />
       </method>
       <method name="GetJustify" cname="gtk_label_get_justify">
-        <return-type type="GtkJustification"/>
+        <return-type type="GtkJustification" />
       </method>
       <method name="GetLabel" cname="gtk_label_get_label">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetLayout" cname="gtk_label_get_layout">
-        <return-type type="PangoLayout*"/>
+        <return-type type="PangoLayout*" />
       </method>
       <method name="GetLayoutOffsets" cname="gtk_label_get_layout_offsets">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="x"/>
-          <parameter type="gint*" name="y"/>
+          <parameter type="gint*" name="x" />
+          <parameter type="gint*" name="y" />
         </parameters>
       </method>
       <method name="GetLineWrap" cname="gtk_label_get_line_wrap">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetMnemonicKeyval" cname="gtk_label_get_mnemonic_keyval">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetMnemonicWidget" cname="gtk_label_get_mnemonic_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetSelectable" cname="gtk_label_get_selectable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSelectionBounds" cname="gtk_label_get_selection_bounds">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint*" name="start"/>
-          <parameter type="gint*" name="end"/>
+          <parameter type="gint*" name="start" />
+          <parameter type="gint*" name="end" />
         </parameters>
       </method>
       <method name="GetText" cname="gtk_label_get_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_label_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUseMarkup" cname="gtk_label_get_use_markup">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetUseUnderline" cname="gtk_label_get_use_underline">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <constructor cname="gtk_label_new" preferred="1">
         <parameters>
-          <parameter type="const-char*" name="str"/>
+          <parameter type="const-char*" name="str" />
         </parameters>
       </constructor>
       <constructor cname="gtk_label_new_with_mnemonic">
         <parameters>
-          <parameter type="const-char*" name="str"/>
+          <parameter type="const-char*" name="str" />
         </parameters>
       </constructor>
       <method name="SelectRegion" cname="gtk_label_select_region">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="start_offset"/>
-          <parameter type="gint" name="end_offset"/>
+          <parameter type="gint" name="start_offset" />
+          <parameter type="gint" name="end_offset" />
         </parameters>
       </method>
       <method name="SetAttributes" cname="gtk_label_set_attributes">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="PangoAttrList*" name="attrs"/>
+          <parameter type="PangoAttrList*" name="attrs" />
         </parameters>
       </method>
       <method name="SetJustify" cname="gtk_label_set_justify">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkJustification" name="jtype"/>
+          <parameter type="GtkJustification" name="jtype" />
         </parameters>
       </method>
       <method name="SetLabel" cname="gtk_label_set_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </method>
       <method name="SetLineWrap" cname="gtk_label_set_line_wrap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="wrap"/>
+          <parameter type="gboolean" name="wrap" />
         </parameters>
       </method>
       <method name="SetMarkup" cname="gtk_label_set_markup">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </method>
       <method name="SetMarkupWithMnemonic" cname="gtk_label_set_markup_with_mnemonic">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </method>
       <method name="SetMnemonicWidget" cname="gtk_label_set_mnemonic_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="SetPattern" cname="gtk_label_set_pattern">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="pattern"/>
+          <parameter type="const-gchar*" name="pattern" />
         </parameters>
       </method>
       <method name="SetSelectable" cname="gtk_label_set_selectable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_label_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="str"/>
+          <parameter type="const-char*" name="str" />
         </parameters>
       </method>
       <method name="SetTextWithMnemonic" cname="gtk_label_set_text_with_mnemonic">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </method>
       <method name="SetUseMarkup" cname="gtk_label_set_use_markup">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetUseUnderline" cname="gtk_label_set_use_underline">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
     </object>
     <object name="Layout" cname="GtkLayout" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="width" type="guint"/>
-      <field cname="height" type="guint"/>
-      <field cname="hadjustment" type="GtkAdjustment*"/>
-      <field cname="vadjustment" type="GtkAdjustment*"/>
-      <field cname="bin_window" type="GdkWindow*"/>
-      <field cname="visibility" type="GdkVisibilityState"/>
-      <field cname="scroll_x" type="gint"/>
-      <field cname="scroll_y" type="gint"/>
-      <field cname="freeze_count" type="guint"/>
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="guint" readable="true" writeable="true"/>
-      <property name="Height" cname="height" type="guint" readable="true" writeable="true"/>
+      <field cname="children" type="GList*" />
+      <field cname="width" type="guint" />
+      <field cname="height" type="guint" />
+      <field cname="hadjustment" type="GtkAdjustment*" />
+      <field cname="vadjustment" type="GtkAdjustment*" />
+      <field cname="bin_window" type="GdkWindow*" />
+      <field cname="visibility" type="GdkVisibilityState" />
+      <field cname="scroll_x" type="gint" />
+      <field cname="scroll_y" type="gint" />
+      <field cname="freeze_count" type="guint" />
+      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="guint" readable="true" writeable="true" />
+      <property name="Height" cname="height" type="guint" readable="true" writeable="true" />
       <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkLayout*" name="layout"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
+          <parameter type="GtkLayout*" name="layout" />
+          <parameter type="GtkAdjustment*" name="hadjustment" />
+          <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
       <method name="GetHadjustment" cname="gtk_layout_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetSize" cname="gtk_layout_get_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint*" name="width"/>
-          <parameter type="guint*" name="height"/>
+          <parameter type="guint*" name="width" />
+          <parameter type="guint*" name="height" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_layout_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVadjustment" cname="gtk_layout_get_vadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="Move" cname="gtk_layout_move">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child_widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkWidget*" name="child_widget" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <constructor cname="gtk_layout_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1"/>
-          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1" />
+          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1" />
         </parameters>
       </constructor>
       <method name="Put" cname="gtk_layout_put">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child_widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkWidget*" name="child_widget" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <method name="SetHadjustment" cname="gtk_layout_set_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </method>
       <method name="SetSize" cname="gtk_layout_set_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="width"/>
-          <parameter type="guint" name="height"/>
+          <parameter type="guint" name="width" />
+          <parameter type="guint" name="height" />
         </parameters>
       </method>
       <method name="SetVadjustment" cname="gtk_layout_set_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </method>
     </object>
     <object name="ListStore" cname="GtkListStore" parent="GObject">
-      <field cname="stamp" type="gint"/>
-      <field cname="root" type="gpointer"/>
-      <field cname="tail" type="gpointer"/>
-      <field cname="sort_list" type="GList*"/>
-      <field cname="n_columns" type="gint"/>
-      <field cname="sort_column_id" type="gint"/>
-      <field cname="order" type="GtkSortType"/>
-      <field cname="column_headers" type="GType*"/>
-      <field cname="length" type="gint"/>
-      <field cname="default_sort_func" type="GtkTreeIterCompareFunc"/>
-      <field cname="default_sort_data" type="gpointer"/>
-      <field cname="default_sort_destroy" type="GtkDestroyNotify"/>
-      <field cname="columns_dirty" bits="1" type="guint"/>
+      <field cname="stamp" type="gint" />
+      <field cname="root" type="gpointer" />
+      <field cname="tail" type="gpointer" />
+      <field cname="sort_list" type="GList*" />
+      <field cname="n_columns" type="gint" />
+      <field cname="sort_column_id" type="gint" />
+      <field cname="order" type="GtkSortType" />
+      <field cname="column_headers" type="GType*" />
+      <field cname="length" type="gint" />
+      <field cname="default_sort_func" type="GtkTreeIterCompareFunc" />
+      <field cname="default_sort_data" type="gpointer" />
+      <field cname="default_sort_destroy" type="GtkDestroyNotify" />
+      <field cname="columns_dirty" bits="1" type="guint" />
       <implements>
-        <interface cname="GtkTreeModel"/>
-        <interface cname="GtkTreeDragSource"/>
-        <interface cname="GtkTreeDragDest"/>
-        <interface cname="GtkTreeSortable"/>
+        <interface cname="GtkTreeModel" />
+        <interface cname="GtkTreeDragSource" />
+        <interface cname="GtkTreeDragDest" />
+        <interface cname="GtkTreeSortable" />
       </implements>
       <method name="Append" cname="gtk_list_store_append">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="Clear" cname="gtk_list_store_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_list_store_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Insert" cname="gtk_list_store_insert">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertAfter" cname="gtk_list_store_insert_after">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="sibling" />
         </parameters>
       </method>
       <method name="InsertBefore" cname="gtk_list_store_insert_before">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="sibling" />
         </parameters>
       </method>
       <method name="IterIsValid" cname="gtk_list_store_iter_is_valid">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="MoveAfter" cname="gtk_list_store_move_after">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreeIter*" name="position" />
         </parameters>
       </method>
       <method name="MoveBefore" cname="gtk_list_store_move_before">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreeIter*" name="position" />
         </parameters>
       </method>
       <constructor cname="gtk_list_store_new">
         <parameters>
-          <parameter type="gint" name="n_columns"/>
-          <parameter ellipsis="true"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <constructor cname="gtk_list_store_newv">
         <parameters va_type="length_param">
-          <parameter type="gint" name="n_columns"/>
-          <parameter type="GType*" name="types"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter type="GType*" name="types" />
         </parameters>
       </constructor>
       <method name="Prepend" cname="gtk_list_store_prepend">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_list_store_remove">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="Reorder" cname="gtk_list_store_reorder">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="new_order"/>
+          <parameter type="gint*" name="new_order" />
         </parameters>
       </method>
       <method name="Set" cname="gtk_list_store_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="SetColumnTypes" cname="gtk_list_store_set_column_types">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="n_columns"/>
-          <parameter type="GType*" name="types" array="true"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter type="GType*" name="types" array="1" />
         </parameters>
       </method>
       <method name="SetValist" cname="gtk_list_store_set_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="SetValue" cname="gtk_list_store_set_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GValue*" name="value"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint" name="column" />
+          <parameter type="GValue*" name="value" />
         </parameters>
       </method>
       <method name="Swap" cname="gtk_list_store_swap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="a"/>
-          <parameter type="GtkTreeIter*" name="b"/>
+          <parameter type="GtkTreeIter*" name="a" />
+          <parameter type="GtkTreeIter*" name="b" />
         </parameters>
       </method>
     </object>
     <object name="Menu" cname="GtkMenu" parent="GtkMenuShell">
-      <field cname="parent_menu_item" type="GtkWidget*"/>
-      <field cname="old_active_menu_item" type="GtkWidget*"/>
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="accel_path" type="gchar*"/>
-      <field cname="position_func" type="GtkMenuPositionFunc"/>
-      <field cname="position_func_data" type="gpointer"/>
-      <field cname="toggle_size" type="guint"/>
-      <field cname="toplevel" type="GtkWidget*"/>
-      <field cname="tearoff_window" type="GtkWidget*"/>
-      <field cname="tearoff_hbox" type="GtkWidget*"/>
-      <field cname="tearoff_scrollbar" type="GtkWidget*"/>
-      <field cname="tearoff_adjustment" type="GtkAdjustment*"/>
-      <field cname="view_window" type="GdkWindow*"/>
-      <field cname="bin_window" type="GdkWindow*"/>
-      <field cname="scroll_offset" type="gint"/>
-      <field cname="saved_scroll_offset" type="gint"/>
-      <field cname="scroll_step" type="gint"/>
-      <field cname="timeout_id" type="guint"/>
-      <field cname="navigation_region" type="GdkRegion*"/>
-      <field cname="navigation_timeout" type="guint"/>
-      <field cname="needs_destruction_ref_count" bits="1" type="guint"/>
-      <field cname="torn_off" bits="1" type="guint"/>
-      <field cname="tearoff_active" bits="1" type="guint"/>
-      <field cname="scroll_fast" bits="1" type="guint"/>
-      <field cname="upper_arrow_visible" bits="1" type="guint"/>
-      <field cname="lower_arrow_visible" bits="1" type="guint"/>
-      <field cname="upper_arrow_prelight" bits="1" type="guint"/>
-      <field cname="lower_arrow_prelight" bits="1" type="guint"/>
+      <field cname="parent_menu_item" type="GtkWidget*" />
+      <field cname="old_active_menu_item" type="GtkWidget*" />
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="accel_path" type="gchar*" />
+      <field cname="position_func" type="GtkMenuPositionFunc" />
+      <field cname="position_func_data" type="gpointer" />
+      <field cname="toggle_size" type="guint" />
+      <field cname="toplevel" type="GtkWidget*" />
+      <field cname="tearoff_window" type="GtkWidget*" />
+      <field cname="tearoff_hbox" type="GtkWidget*" />
+      <field cname="tearoff_scrollbar" type="GtkWidget*" />
+      <field cname="tearoff_adjustment" type="GtkAdjustment*" />
+      <field cname="view_window" type="GdkWindow*" />
+      <field cname="bin_window" type="GdkWindow*" />
+      <field cname="scroll_offset" type="gint" />
+      <field cname="saved_scroll_offset" type="gint" />
+      <field cname="scroll_step" type="gint" />
+      <field cname="timeout_id" type="guint" />
+      <field cname="navigation_region" type="GdkRegion*" />
+      <field cname="navigation_timeout" type="guint" />
+      <field cname="needs_destruction_ref_count" bits="1" type="guint" />
+      <field cname="torn_off" bits="1" type="guint" />
+      <field cname="tearoff_active" bits="1" type="guint" />
+      <field cname="scroll_fast" bits="1" type="guint" />
+      <field cname="upper_arrow_visible" bits="1" type="guint" />
+      <field cname="lower_arrow_visible" bits="1" type="guint" />
+      <field cname="upper_arrow_prelight" bits="1" type="guint" />
+      <field cname="lower_arrow_prelight" bits="1" type="guint" />
       <signal name="MoveScroll" cname="move_scroll" when="LAST">
-        <return-type type="GNone"/>
+        <return-type type="GNone" />
         <parameters>
-          <parameter name="p0" type="GtkScrollType);"/>
+          <parameter name="p0" type="GtkScrollType);" />
         </parameters>
       </signal>
-      <property name="TearoffTitle" cname="tearoff-title" type="gchar*" readable="true" writeable="true"/>
+      <property name="TearoffTitle" cname="tearoff-title" type="gchar*" readable="true" writeable="true" />
       <method name="AttachToWidget" cname="gtk_menu_attach_to_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="attach_widget"/>
-          <parameter type="GtkMenuDetachFunc" name="detacher"/>
+          <parameter type="GtkWidget*" name="attach_widget" />
+          <parameter type="GtkMenuDetachFunc" name="detacher" />
         </parameters>
       </method>
       <method name="Detach" cname="gtk_menu_detach">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetAccelGroup" cname="gtk_menu_get_accel_group">
-        <return-type type="GtkAccelGroup*"/>
+        <return-type type="GtkAccelGroup*" />
       </method>
       <method name="GetActive" cname="gtk_menu_get_active">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetAttachWidget" cname="gtk_menu_get_attach_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetTearoffState" cname="gtk_menu_get_tearoff_state">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetTitle" cname="gtk_menu_get_title">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_menu_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_menu_new"/>
+      <constructor cname="gtk_menu_new" />
       <method name="Popdown" cname="gtk_menu_popdown">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Popup" cname="gtk_menu_popup">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="parent_menu_shell" null_ok="1"/>
-          <parameter type="GtkWidget*" name="parent_menu_item" null_ok="1"/>
-          <parameter type="GtkMenuPositionFunc" name="func" null_ok="1"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="guint" name="button"/>
-          <parameter type="guint32" name="activate_time"/>
+          <parameter type="GtkWidget*" name="parent_menu_shell" null_ok="1" />
+          <parameter type="GtkWidget*" name="parent_menu_item" null_ok="1" />
+          <parameter type="GtkMenuPositionFunc" name="func" null_ok="1" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="guint" name="button" />
+          <parameter type="guint32" name="activate_time" />
         </parameters>
       </method>
       <method name="ReorderChild" cname="gtk_menu_reorder_child">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="Reposition" cname="gtk_menu_reposition">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetAccelGroup" cname="gtk_menu_set_accel_group">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="SetAccelPath" cname="gtk_menu_set_accel_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
+          <parameter type="const-gchar*" name="accel_path" />
         </parameters>
       </method>
       <method name="SetActive" cname="gtk_menu_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="index_"/>
+          <parameter type="guint" name="index_" />
         </parameters>
       </method>
       <method name="SetScreen" cname="gtk_menu_set_screen" new_flag="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkScreen*" name="screen"/>
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </method>
       <method name="SetTearoffState" cname="gtk_menu_set_tearoff_state">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="torn_off"/>
+          <parameter type="gboolean" name="torn_off" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gtk_menu_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
     </object>
     <object name="MenuBar" cname="GtkMenuBar" parent="GtkMenuShell">
       <method name="GetType" cname="gtk_menu_bar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_menu_bar_new"/>
+      <constructor cname="gtk_menu_bar_new" />
     </object>
     <object name="MenuItem" cname="GtkMenuItem" parent="GtkItem">
-      <field cname="submenu" type="GtkWidget*"/>
-      <field cname="event_window" type="GdkWindow*"/>
-      <field cname="toggle_size" type="guint16"/>
-      <field cname="accelerator_width" type="guint16"/>
-      <field cname="accel_path" type="gchar*"/>
-      <field cname="show_submenu_indicator" bits="1" type="guint"/>
-      <field cname="submenu_placement" bits="1" type="guint"/>
-      <field cname="submenu_direction" bits="1" type="guint"/>
-      <field cname="right_justify" bits="1" type="guint"/>
-      <field cname="timer_from_keypress" bits="1" type="guint"/>
-      <field cname="timer" type="guint"/>
+      <field cname="submenu" type="GtkWidget*" />
+      <field cname="event_window" type="GdkWindow*" />
+      <field cname="toggle_size" type="guint16" />
+      <field cname="accelerator_width" type="guint16" />
+      <field cname="accel_path" type="gchar*" />
+      <field cname="show_submenu_indicator" bits="1" type="guint" />
+      <field cname="submenu_placement" bits="1" type="guint" />
+      <field cname="submenu_direction" bits="1" type="guint" />
+      <field cname="right_justify" bits="1" type="guint" />
+      <field cname="timer_from_keypress" bits="1" type="guint" />
+      <field cname="timer" type="guint" />
       <signal name="Activated" cname="activate" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuItem*" name="menu_item"/>
+          <parameter type="GtkMenuItem*" name="menu_item" />
         </parameters>
       </signal>
       <signal name="ActivateItem" cname="activate_item" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuItem*" name="menu_item"/>
+          <parameter type="GtkMenuItem*" name="menu_item" />
         </parameters>
       </signal>
       <signal name="ToggleSizeRequested" cname="toggle_size_request" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuItem*" name="menu_item"/>
-          <parameter type="gint*" name="requisition"/>
+          <parameter type="GtkMenuItem*" name="menu_item" />
+          <parameter type="gint*" name="requisition" />
         </parameters>
       </signal>
       <signal name="ToggleSizeAllocated" cname="toggle_size_allocate" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuItem*" name="menu_item"/>
-          <parameter type="gint" name="allocation"/>
+          <parameter type="GtkMenuItem*" name="menu_item" />
+          <parameter type="gint" name="allocation" />
         </parameters>
       </signal>
       <method name="Activate" cname="gtk_menu_item_activate">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Deselect" cname="gtk_menu_item_deselect">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetRightJustified" cname="gtk_menu_item_get_right_justified">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSubmenu" cname="gtk_menu_item_get_submenu">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gtk_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_menu_item_new"/>
+      <constructor cname="gtk_menu_item_new" />
       <constructor cname="gtk_menu_item_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_menu_item_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="RemoveSubmenu" cname="gtk_menu_item_remove_submenu">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Select" cname="gtk_menu_item_select">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetAccelPath" cname="gtk_menu_item_set_accel_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
+          <parameter type="const-gchar*" name="accel_path" />
         </parameters>
       </method>
       <method name="SetRightJustified" cname="gtk_menu_item_set_right_justified">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="right_justified"/>
+          <parameter type="gboolean" name="right_justified" />
         </parameters>
       </method>
       <method name="SetSubmenu" cname="gtk_menu_item_set_submenu">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="submenu" null_ok="1"/>
+          <parameter type="GtkWidget*" name="submenu" null_ok="1" />
         </parameters>
       </method>
       <method name="ToggleSizeAllocate" cname="gtk_menu_item_toggle_size_allocate">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="allocation"/>
+          <parameter type="gint" name="allocation" />
         </parameters>
       </method>
       <method name="ToggleSizeRequest" cname="gtk_menu_item_toggle_size_request">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="requisition"/>
+          <parameter type="gint*" name="requisition" />
         </parameters>
       </method>
     </object>
     <object name="MenuShell" cname="GtkMenuShell" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="active_menu_item" type="GtkWidget*"/>
-      <field cname="parent_menu_shell" type="GtkWidget*"/>
-      <field cname="button" type="guint"/>
-      <field cname="activate_time" type="guint32"/>
-      <field cname="active" bits="1" type="guint"/>
-      <field cname="have_grab" bits="1" type="guint"/>
-      <field cname="have_xgrab" bits="1" type="guint"/>
-      <field cname="ignore_leave" bits="1" type="guint"/>
-      <field cname="menu_flag" bits="1" type="guint"/>
-      <field cname="ignore_enter" bits="1" type="guint"/>
+      <field cname="children" type="GList*" />
+      <field cname="active_menu_item" type="GtkWidget*" />
+      <field cname="parent_menu_shell" type="GtkWidget*" />
+      <field cname="button" type="guint" />
+      <field cname="activate_time" type="guint32" />
+      <field cname="active" bits="1" type="guint" />
+      <field cname="have_grab" bits="1" type="guint" />
+      <field cname="have_xgrab" bits="1" type="guint" />
+      <field cname="ignore_leave" bits="1" type="guint" />
+      <field cname="menu_flag" bits="1" type="guint" />
+      <field cname="ignore_enter" bits="1" type="guint" />
       <signal name="Deactivated" cname="deactivate" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
       <signal name="SelectionDone" cname="selection-done" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
       <signal name="MoveCurrent" cname="move_current" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
-          <parameter type="GtkMenuDirectionType" name="direction"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
+          <parameter type="GtkMenuDirectionType" name="direction" />
         </parameters>
       </signal>
       <signal name="ActivateCurrent" cname="activate_current" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
-          <parameter type="gboolean" name="force_hide"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
+          <parameter type="gboolean" name="force_hide" />
         </parameters>
       </signal>
       <signal name="Cancel" cname="cancel" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMenuShell*" name="menu_shell"/>
+          <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
       <signal name="CycleFocus" cname="cycle_focus" when="LAST">
-        <return-type type="GNone"/>
+        <return-type type="GNone" />
         <parameters>
-          <parameter name="p0" type="GtkDirectionType);"/>
+          <parameter name="p0" type="GtkDirectionType);" />
         </parameters>
       </signal>
       <method name="ActivateItem" cname="gtk_menu_shell_activate_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="menu_item"/>
-          <parameter type="gboolean" name="force_deactivate"/>
+          <parameter type="GtkWidget*" name="menu_item" />
+          <parameter type="gboolean" name="force_deactivate" />
         </parameters>
       </method>
       <method name="Append" cname="gtk_menu_shell_append">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="Deactivate" cname="gtk_menu_shell_deactivate">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Deselect" cname="gtk_menu_shell_deselect">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_menu_shell_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Insert" cname="gtk_menu_shell_insert">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="Prepend" cname="gtk_menu_shell_prepend">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="SelectFirst" cname="gtk_menu_shell_select_first">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="search_sensitive"/>
+          <parameter type="gboolean" name="search_sensitive" />
         </parameters>
       </method>
       <method name="SelectItem" cname="gtk_menu_shell_select_item">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="menu_item"/>
+          <parameter type="GtkWidget*" name="menu_item" />
         </parameters>
       </method>
     </object>
     <object name="MessageDialog" cname="GtkMessageDialog" parent="GtkDialog">
-      <field cname="image" type="GtkWidget*"/>
-      <field cname="label" type="GtkWidget*"/>
-      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct-only="true"/>
-      <property name="Buttons" cname="buttons" type="GtkButtonsType" writeable="true" construct-only="true"/>
+      <field cname="image" type="GtkWidget*" />
+      <field cname="label" type="GtkWidget*" />
+      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct-only="true" />
+      <property name="Buttons" cname="buttons" type="GtkButtonsType" writeable="true" construct-only="true" />
       <method name="GetType" cname="gtk_message_dialog_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_message_dialog_new">
         <parameters>
-          <parameter type="GtkWindow*" name="parent" null_ok="1"/>
-          <parameter type="GtkDialogFlags" name="flags"/>
-          <parameter type="GtkMessageType" name="type"/>
-          <parameter type="GtkButtonsType" name="buttons"/>
-          <parameter type="const-gchar*" name="message_format"/>
-          <parameter ellipsis="true"/>
-          <parameter type="GtkWindow      *parent,                                         GtkDialogFlags  flags,                                         GtkMessageType  type,                                         GtkButtonsType  buttons,                                         const gchar    *message_format,                                         ...) G_GNUC_PRINTF (5, 6" name=""/>
+          <parameter type="GtkWindow*" name="parent" null_ok="1" />
+          <parameter type="GtkDialogFlags" name="flags" />
+          <parameter type="GtkMessageType" name="type" />
+          <parameter type="GtkButtonsType" name="buttons" />
+          <parameter type="const-gchar*" name="message_format" />
+          <parameter ellipsis="true" />
+          <parameter type="GtkWindow      *parent,                                         GtkDialogFlags  flags,                                         GtkMessageType  type,                                         GtkButtonsType  buttons,                                         const gchar    *message_format,                                         ...) G_GNUC_PRINTF (5, 6" name="" />
         </parameters>
       </constructor>
     </object>
     <object name="Misc" cname="GtkMisc" parent="GtkWidget">
-      <field cname="xalign" type="gfloat"/>
-      <field cname="yalign" type="gfloat"/>
-      <field cname="xpad" type="guint16"/>
-      <field cname="ypad" type="guint16"/>
-      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true"/>
-      <property name="Xpad" cname="xpad" type="gint" readable="true" writeable="true"/>
-      <property name="Ypad" cname="ypad" type="gint" readable="true" writeable="true"/>
+      <field cname="xalign" type="gfloat" />
+      <field cname="yalign" type="gfloat" />
+      <field cname="xpad" type="guint16" />
+      <field cname="ypad" type="guint16" />
+      <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
+      <property name="Xpad" cname="xpad" type="gint" readable="true" writeable="true" />
+      <property name="Ypad" cname="ypad" type="gint" readable="true" writeable="true" />
       <method name="GetAlignment" cname="gtk_misc_get_alignment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat*" name="xalign"/>
-          <parameter type="gfloat*" name="yalign"/>
+          <parameter type="gfloat*" name="xalign" />
+          <parameter type="gfloat*" name="yalign" />
         </parameters>
       </method>
       <method name="GetPadding" cname="gtk_misc_get_padding">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="xpad"/>
-          <parameter type="gint*" name="ypad"/>
+          <parameter type="gint*" name="xpad" />
+          <parameter type="gint*" name="ypad" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_misc_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SetAlignment" cname="gtk_misc_set_alignment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
+          <parameter type="gfloat" name="xalign" />
+          <parameter type="gfloat" name="yalign" />
         </parameters>
       </method>
       <method name="SetPadding" cname="gtk_misc_set_padding">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="xpad"/>
-          <parameter type="gint" name="ypad"/>
+          <parameter type="gint" name="xpad" />
+          <parameter type="gint" name="ypad" />
         </parameters>
       </method>
     </object>
     <object name="Notebook" cname="GtkNotebook" parent="GtkContainer">
-      <field cname="cur_page" type="GtkNotebookPage*"/>
-      <field cname="children" type="GList*"/>
-      <field cname="first_tab" type="GList*"/>
-      <field cname="focus_tab" type="GList*"/>
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="event_window" type="GdkWindow*"/>
-      <field cname="timer" type="guint32"/>
-      <field cname="tab_hborder" type="guint16"/>
-      <field cname="tab_vborder" type="guint16"/>
-      <field cname="show_tabs" bits="1" type="guint"/>
-      <field cname="homogeneous" bits="1" type="guint"/>
-      <field cname="show_border" bits="1" type="guint"/>
-      <field cname="tab_pos" bits="2" type="guint"/>
-      <field cname="scrollable" bits="1" type="guint"/>
-      <field cname="in_child" bits="2" type="guint"/>
-      <field cname="click_child" bits="2" type="guint"/>
-      <field cname="button" bits="2" type="guint"/>
-      <field cname="need_timer" bits="1" type="guint"/>
-      <field cname="child_has_focus" bits="1" type="guint"/>
-      <field cname="have_visible_child" bits="1" type="guint"/>
-      <field cname="focus_out" bits="1" type="guint"/>
-      <property name="Page" cname="page" type="gint" readable="true" writeable="true"/>
-      <property name="TabPos" cname="tab_pos" type="GtkPositionType" readable="true" writeable="true"/>
-      <property name="TabBorder" cname="tab_border" type="guint" writeable="true"/>
-      <property name="TabHborder" cname="tab_hborder" type="guint" readable="true" writeable="true"/>
-      <property name="TabVborder" cname="tab_vborder" type="guint" readable="true" writeable="true"/>
-      <property name="ShowTabs" cname="show_tabs" type="gboolean" readable="true" writeable="true"/>
-      <property name="ShowBorder" cname="show_border" type="gboolean" readable="true" writeable="true"/>
-      <property name="Scrollable" cname="scrollable" type="gboolean" readable="true" writeable="true"/>
-      <property name="EnablePopup" cname="enable_popup" type="gboolean" readable="true" writeable="true"/>
-      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true"/>
+      <field cname="cur_page" type="GtkNotebookPage*" />
+      <field cname="children" type="GList*" />
+      <field cname="first_tab" type="GList*" />
+      <field cname="focus_tab" type="GList*" />
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="event_window" type="GdkWindow*" />
+      <field cname="timer" type="guint32" />
+      <field cname="tab_hborder" type="guint16" />
+      <field cname="tab_vborder" type="guint16" />
+      <field cname="show_tabs" bits="1" type="guint" />
+      <field cname="homogeneous" bits="1" type="guint" />
+      <field cname="show_border" bits="1" type="guint" />
+      <field cname="tab_pos" bits="2" type="guint" />
+      <field cname="scrollable" bits="1" type="guint" />
+      <field cname="in_child" bits="2" type="guint" />
+      <field cname="click_child" bits="2" type="guint" />
+      <field cname="button" bits="2" type="guint" />
+      <field cname="need_timer" bits="1" type="guint" />
+      <field cname="child_has_focus" bits="1" type="guint" />
+      <field cname="have_visible_child" bits="1" type="guint" />
+      <field cname="focus_out" bits="1" type="guint" />
+      <property name="Page" cname="page" type="gint" readable="true" writeable="true" />
+      <property name="TabPos" cname="tab_pos" type="GtkPositionType" readable="true" writeable="true" />
+      <property name="TabBorder" cname="tab_border" type="guint" writeable="true" />
+      <property name="TabHborder" cname="tab_hborder" type="guint" readable="true" writeable="true" />
+      <property name="TabVborder" cname="tab_vborder" type="guint" readable="true" writeable="true" />
+      <property name="ShowTabs" cname="show_tabs" type="gboolean" readable="true" writeable="true" />
+      <property name="ShowBorder" cname="show_border" type="gboolean" readable="true" writeable="true" />
+      <property name="Scrollable" cname="scrollable" type="gboolean" readable="true" writeable="true" />
+      <property name="EnablePopup" cname="enable_popup" type="gboolean" readable="true" writeable="true" />
+      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true" />
       <signal name="SwitchPage" cname="switch_page" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="GtkNotebookPage*" name="page"/>
-          <parameter type="guint" name="page_num"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="GtkNotebookPage*" name="page" />
+          <parameter type="guint" name="page_num" />
         </parameters>
       </signal>
       <signal name="FocusTab" cname="focus_tab" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="GtkNotebookTab" name="type"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="GtkNotebookTab" name="type" />
         </parameters>
       </signal>
       <signal name="SelectPage" cname="select_page" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="gboolean" name="move_focus"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="gboolean" name="move_focus" />
         </parameters>
       </signal>
       <signal name="ChangeCurrentPage" cname="change_current_page" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="gint" name="offset"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="gint" name="offset" />
         </parameters>
       </signal>
       <signal name="MoveFocusOut" cname="move_focus_out" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
       <method name="AppendPage" cname="gtk_notebook_append_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
         </parameters>
       </method>
       <method name="AppendPageMenu" cname="gtk_notebook_append_page_menu">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="GtkWidget*" name="menu_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
+          <parameter type="GtkWidget*" name="menu_label" />
         </parameters>
       </method>
       <method name="GetCurrentPage" cname="gtk_notebook_get_current_page">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMenuLabel" cname="gtk_notebook_get_menu_label">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="GetMenuLabelText" cname="gtk_notebook_get_menu_label_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="GetNPages" cname="gtk_notebook_get_n_pages">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetNthPage" cname="gtk_notebook_get_nth_page">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="gint" name="page_num"/>
+          <parameter type="gint" name="page_num" />
         </parameters>
       </method>
       <method name="GetScrollable" cname="gtk_notebook_get_scrollable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetShowBorder" cname="gtk_notebook_get_show_border">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetShowTabs" cname="gtk_notebook_get_show_tabs">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetTabLabel" cname="gtk_notebook_get_tab_label">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="GetTabLabelText" cname="gtk_notebook_get_tab_label_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="GetTabPos" cname="gtk_notebook_get_tab_pos">
-        <return-type type="GtkPositionType"/>
+        <return-type type="GtkPositionType" />
       </method>
       <method name="GetType" cname="gtk_notebook_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="InsertPage" cname="gtk_notebook_insert_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertPageMenu" cname="gtk_notebook_insert_page_menu">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="GtkWidget*" name="menu_label"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
+          <parameter type="GtkWidget*" name="menu_label" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
-      <constructor cname="gtk_notebook_new"/>
+      <constructor cname="gtk_notebook_new" />
       <method name="NextPage" cname="gtk_notebook_next_page">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PopupDisable" cname="gtk_notebook_popup_disable">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PopupEnable" cname="gtk_notebook_popup_enable">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PrependPage" cname="gtk_notebook_prepend_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
         </parameters>
       </method>
       <method name="PrependPageMenu" cname="gtk_notebook_prepend_page_menu">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="GtkWidget*" name="menu_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
+          <parameter type="GtkWidget*" name="menu_label" />
         </parameters>
       </method>
       <method name="PrevPage" cname="gtk_notebook_prev_page">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="QueryTabLabelPacking" cname="gtk_notebook_query_tab_label_packing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean*" name="expand"/>
-          <parameter type="gboolean*" name="fill"/>
-          <parameter type="GtkPackType*" name="pack_type"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean*" name="expand" />
+          <parameter type="gboolean*" name="fill" />
+          <parameter type="GtkPackType*" name="pack_type" />
         </parameters>
       </method>
       <method name="RemovePage" cname="gtk_notebook_remove_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="page_num"/>
+          <parameter type="gint" name="page_num" />
         </parameters>
       </method>
       <method name="ReorderChild" cname="gtk_notebook_reorder_child">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="SetCurrentPage" cname="gtk_notebook_set_current_page">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="page_num"/>
+          <parameter type="gint" name="page_num" />
         </parameters>
       </method>
       <method name="SetMenuLabel" cname="gtk_notebook_set_menu_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="menu_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="menu_label" />
         </parameters>
       </method>
       <method name="SetMenuLabelText" cname="gtk_notebook_set_menu_label_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="menu_text"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="menu_text" />
         </parameters>
       </method>
       <method name="SetScrollable" cname="gtk_notebook_set_scrollable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="scrollable"/>
+          <parameter type="gboolean" name="scrollable" />
         </parameters>
       </method>
       <method name="SetShowBorder" cname="gtk_notebook_set_show_border">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_border"/>
+          <parameter type="gboolean" name="show_border" />
         </parameters>
       </method>
       <method name="SetShowTabs" cname="gtk_notebook_set_show_tabs">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="show_tabs"/>
+          <parameter type="gboolean" name="show_tabs" />
         </parameters>
       </method>
       <method name="SetTabLabel" cname="gtk_notebook_set_tab_label">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkWidget*" name="tab_label" />
         </parameters>
       </method>
       <method name="SetTabLabelPacking" cname="gtk_notebook_set_tab_label_packing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="expand"/>
-          <parameter type="gboolean" name="fill"/>
-          <parameter type="GtkPackType" name="pack_type"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="expand" />
+          <parameter type="gboolean" name="fill" />
+          <parameter type="GtkPackType" name="pack_type" />
         </parameters>
       </method>
       <method name="SetTabLabelText" cname="gtk_notebook_set_tab_label_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="tab_text"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="const-gchar*" name="tab_text" />
         </parameters>
       </method>
       <method name="SetTabPos" cname="gtk_notebook_set_tab_pos">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPositionType" name="pos"/>
+          <parameter type="GtkPositionType" name="pos" />
         </parameters>
       </method>
     </object>
     <object name="Object" cname="GtkObject" parent="GObject">
-      <field cname="flags" type="guint32"/>
-      <property name="UserData" cname="user_data" type="gpointer" readable="true" writeable="true"/>
+      <field cname="flags" type="guint32" />
+      <property name="UserData" cname="user_data" type="gpointer" readable="true" writeable="true" />
       <signal name="Destroyed" cname="destroy" when="CLEANUP">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkObject*" name="object"/>
+          <parameter type="GtkObject*" name="object" />
         </parameters>
       </signal>
       <method name="Destroy" cname="gtk_object_destroy">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_object_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
       <constructor cname="gtk_object_new">
         <parameters>
-          <parameter type="GtkType" name="type"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkType" name="type" />
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <method name="Sink" cname="gtk_object_sink">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="OptionMenu" cname="GtkOptionMenu" parent="GtkButton">
-      <field cname="menu" type="GtkWidget*"/>
-      <field cname="menu_item" type="GtkWidget*"/>
-      <field cname="width" type="guint16"/>
-      <field cname="height" type="guint16"/>
+      <field cname="menu" type="GtkWidget*" />
+      <field cname="menu_item" type="GtkWidget*" />
+      <field cname="width" type="guint16" />
+      <field cname="height" type="guint16" />
       <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkOptionMenu*" name="option_menu"/>
+          <parameter type="GtkOptionMenu*" name="option_menu" />
         </parameters>
       </signal>
-      <property name="Menu" cname="menu" type="GtkMenu" readable="true" writeable="true"/>
+      <property name="Menu" cname="menu" type="GtkMenu" readable="true" writeable="true" />
       <method name="GetHistory" cname="gtk_option_menu_get_history">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMenu" cname="gtk_option_menu_get_menu">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gtk_option_menu_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_option_menu_new"/>
+      <constructor cname="gtk_option_menu_new" />
       <method name="RemoveMenu" cname="gtk_option_menu_remove_menu">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetHistory" cname="gtk_option_menu_set_history">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="index_"/>
+          <parameter type="guint" name="index_" />
         </parameters>
       </method>
       <method name="SetMenu" cname="gtk_option_menu_set_menu">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="menu"/>
+          <parameter type="GtkWidget*" name="menu" />
         </parameters>
       </method>
     </object>
     <object name="Paned" cname="GtkPaned" parent="GtkContainer">
-      <field cname="child1" type="GtkWidget*"/>
-      <field cname="child2" type="GtkWidget*"/>
-      <field cname="handle" type="GdkWindow*"/>
-      <field cname="xor_gc" type="GdkGC*"/>
-      <field cname="cursor_type" type="GdkCursorType"/>
-      <field cname="handle_pos" type="GdkRectangle"/>
-      <field cname="child1_size" type="gint"/>
-      <field cname="last_allocation" type="gint"/>
-      <field cname="min_position" type="gint"/>
-      <field cname="max_position" type="gint"/>
-      <field cname="position_set" bits="1" type="guint"/>
-      <field cname="in_drag" bits="1" type="guint"/>
-      <field cname="child1_shrink" bits="1" type="guint"/>
-      <field cname="child1_resize" bits="1" type="guint"/>
-      <field cname="child2_shrink" bits="1" type="guint"/>
-      <field cname="child2_resize" bits="1" type="guint"/>
-      <field cname="orientation" bits="1" type="guint"/>
-      <field cname="in_recursion" bits="1" type="guint"/>
-      <field cname="handle_prelit" bits="1" type="guint"/>
-      <field cname="last_child1_focus" type="GtkWidget*"/>
-      <field cname="last_child2_focus" type="GtkWidget*"/>
-      <field cname="priv" type="GtkPanedPrivate*"/>
-      <field cname="drag_pos" type="gint"/>
-      <field cname="original_position" type="gint"/>
-      <property name="Position" cname="position" type="gint" readable="true" writeable="true"/>
-      <property name="PositionSet" cname="position_set" type="gboolean" readable="true" writeable="true"/>
+      <field cname="child1" type="GtkWidget*" />
+      <field cname="child2" type="GtkWidget*" />
+      <field cname="handle" type="GdkWindow*" />
+      <field cname="xor_gc" type="GdkGC*" />
+      <field cname="cursor_type" type="GdkCursorType" />
+      <field cname="handle_pos" type="GdkRectangle" />
+      <field cname="child1_size" type="gint" />
+      <field cname="last_allocation" type="gint" />
+      <field cname="min_position" type="gint" />
+      <field cname="max_position" type="gint" />
+      <field cname="position_set" bits="1" type="guint" />
+      <field cname="in_drag" bits="1" type="guint" />
+      <field cname="child1_shrink" bits="1" type="guint" />
+      <field cname="child1_resize" bits="1" type="guint" />
+      <field cname="child2_shrink" bits="1" type="guint" />
+      <field cname="child2_resize" bits="1" type="guint" />
+      <field cname="orientation" bits="1" type="guint" />
+      <field cname="in_recursion" bits="1" type="guint" />
+      <field cname="handle_prelit" bits="1" type="guint" />
+      <field cname="last_child1_focus" type="GtkWidget*" />
+      <field cname="last_child2_focus" type="GtkWidget*" />
+      <field cname="priv" type="GtkPanedPrivate*" />
+      <field cname="drag_pos" type="gint" />
+      <field cname="original_position" type="gint" />
+      <property name="Position" cname="position" type="gint" readable="true" writeable="true" />
+      <property name="PositionSet" cname="position_set" type="gboolean" readable="true" writeable="true" />
       <signal name="CycleChildFocus" cname="cycle_child_focus" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
-          <parameter type="gboolean" name="reverse"/>
+          <parameter type="GtkPaned*" name="paned" />
+          <parameter type="gboolean" name="reverse" />
         </parameters>
       </signal>
       <signal name="ToggleHandleFocus" cname="toggle_handle_focus" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
+          <parameter type="GtkPaned*" name="paned" />
         </parameters>
       </signal>
       <signal name="MoveHandle" cname="move_handle" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
-          <parameter type="GtkScrollType" name="scroll"/>
+          <parameter type="GtkPaned*" name="paned" />
+          <parameter type="GtkScrollType" name="scroll" />
         </parameters>
       </signal>
       <signal name="CycleHandleFocus" cname="cycle_handle_focus" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
-          <parameter type="gboolean" name="reverse"/>
+          <parameter type="GtkPaned*" name="paned" />
+          <parameter type="gboolean" name="reverse" />
         </parameters>
       </signal>
       <signal name="AcceptPosition" cname="accept_position" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
+          <parameter type="GtkPaned*" name="paned" />
         </parameters>
       </signal>
       <signal name="CancelPosition" cname="cancel_position" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkPaned*" name="paned"/>
+          <parameter type="GtkPaned*" name="paned" />
         </parameters>
       </signal>
       <method name="Add1" cname="gtk_paned_add1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="Add2" cname="gtk_paned_add2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="ComputePosition" cname="gtk_paned_compute_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="allocation"/>
-          <parameter type="gint" name="child1_req"/>
-          <parameter type="gint" name="child2_req"/>
+          <parameter type="gint" name="allocation" />
+          <parameter type="gint" name="child1_req" />
+          <parameter type="gint" name="child2_req" />
         </parameters>
       </method>
       <method name="GetPosition" cname="gtk_paned_get_position">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gtk_paned_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Pack1" cname="gtk_paned_pack1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="resize"/>
-          <parameter type="gboolean" name="shrink"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="resize" />
+          <parameter type="gboolean" name="shrink" />
         </parameters>
       </method>
       <method name="Pack2" cname="gtk_paned_pack2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean" name="resize"/>
-          <parameter type="gboolean" name="shrink"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gboolean" name="resize" />
+          <parameter type="gboolean" name="shrink" />
         </parameters>
       </method>
       <method name="SetPosition" cname="gtk_paned_set_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="position"/>
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
     </object>
     <object name="Plug" cname="GtkPlug" parent="GtkWindow">
-      <field cname="socket_window" type="GdkWindow*"/>
-      <field cname="modality_window" type="GtkWidget*"/>
-      <field cname="modality_group" type="GtkWindowGroup*"/>
-      <field cname="grabbed_keys" type="GHashTable*"/>
-      <field cname="same_app" bits="1" type="guint"/>
+      <field cname="socket_window" type="GdkWindow*" />
+      <field cname="modality_window" type="GtkWidget*" />
+      <field cname="modality_group" type="GtkWindowGroup*" />
+      <field cname="grabbed_keys" type="GHashTable*" />
+      <field cname="same_app" bits="1" type="guint" />
       <signal name="Embedded" cname="embedded" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPlug*" name="plug"/>
+          <parameter type="GtkPlug*" name="plug" />
         </parameters>
       </signal>
       <method name="Construct" cname="gtk_plug_construct">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkNativeWindow" name="socket_id"/>
+          <parameter type="GdkNativeWindow" name="socket_id" />
         </parameters>
       </method>
       <method name="ConstructForDisplay" cname="gtk_plug_construct_for_display">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDisplay*" name="display"/>
-          <parameter type="GdkNativeWindow" name="socket_id"/>
+          <parameter type="GdkDisplay*" name="display" />
+          <parameter type="GdkNativeWindow" name="socket_id" />
         </parameters>
       </method>
       <method name="GetId" cname="gtk_plug_get_id">
-        <return-type type="GdkNativeWindow"/>
+        <return-type type="GdkNativeWindow" />
       </method>
       <method name="GetType" cname="gtk_plug_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_plug_new">
         <parameters>
-          <parameter type="GdkNativeWindow" name="socket_id"/>
+          <parameter type="GdkNativeWindow" name="socket_id" />
         </parameters>
       </constructor>
       <constructor cname="gtk_plug_new_for_display">
         <parameters>
-          <parameter type="GdkDisplay*" name="display"/>
-          <parameter type="GdkNativeWindow" name="socket_id"/>
+          <parameter type="GdkDisplay*" name="display" />
+          <parameter type="GdkNativeWindow" name="socket_id" />
         </parameters>
       </constructor>
     </object>
     <object name="ProgressBar" cname="GtkProgressBar" parent="GtkWidget">
-      <field cname="bar_style" type="GtkProgressBarStyle"/>
-      <field cname="orientation" type="GtkProgressBarOrientation"/>
-      <field cname="blocks" type="guint"/>
-      <field cname="in_block" type="gint"/>
-      <field cname="activity_pos" type="gint"/>
-      <field cname="activity_step" type="guint"/>
-      <field cname="activity_blocks" type="guint"/>
-      <field cname="pulse_fraction" type="gdouble"/>
-      <field cname="activity_dir" bits="1" type="guint"/>
-      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="Orientation" cname="orientation" type="GtkProgressBarOrientation" readable="true" writeable="true"/>
-      <property name="BarStyle" cname="bar_style" type="GtkProgressBarStyle" readable="true" writeable="true"/>
-      <property name="ActivityStep" cname="activity_step" type="guint" readable="true" writeable="true"/>
-      <property name="ActivityBlocks" cname="activity_blocks" type="guint" readable="true" writeable="true"/>
-      <property name="DiscreteBlocks" cname="discrete_blocks" type="guint" readable="true" writeable="true"/>
-      <property name="Fraction" cname="fraction" type="gdouble" readable="true" writeable="true"/>
-      <property name="PulseStep" cname="pulse_step" type="gdouble" readable="true" writeable="true"/>
-      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true"/>
+      <field cname="bar_style" type="GtkProgressBarStyle" />
+      <field cname="orientation" type="GtkProgressBarOrientation" />
+      <field cname="blocks" type="guint" />
+      <field cname="in_block" type="gint" />
+      <field cname="activity_pos" type="gint" />
+      <field cname="activity_step" type="guint" />
+      <field cname="activity_blocks" type="guint" />
+      <field cname="pulse_fraction" type="gdouble" />
+      <field cname="activity_dir" bits="1" type="guint" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="Orientation" cname="orientation" type="GtkProgressBarOrientation" readable="true" writeable="true" />
+      <property name="BarStyle" cname="bar_style" type="GtkProgressBarStyle" readable="true" writeable="true" />
+      <property name="ActivityStep" cname="activity_step" type="guint" readable="true" writeable="true" />
+      <property name="ActivityBlocks" cname="activity_blocks" type="guint" readable="true" writeable="true" />
+      <property name="DiscreteBlocks" cname="discrete_blocks" type="guint" readable="true" writeable="true" />
+      <property name="Fraction" cname="fraction" type="gdouble" readable="true" writeable="true" />
+      <property name="PulseStep" cname="pulse_step" type="gdouble" readable="true" writeable="true" />
+      <property name="Text" cname="text" type="gchar*" readable="true" writeable="true" />
       <method name="GetFraction" cname="gtk_progress_bar_get_fraction">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetOrientation" cname="gtk_progress_bar_get_orientation">
-        <return-type type="GtkProgressBarOrientation"/>
+        <return-type type="GtkProgressBarOrientation" />
       </method>
       <method name="GetPulseStep" cname="gtk_progress_bar_get_pulse_step">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetText" cname="gtk_progress_bar_get_text">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_progress_bar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_progress_bar_new"/>
+      <constructor cname="gtk_progress_bar_new" />
       <method name="Pulse" cname="gtk_progress_bar_pulse">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetFraction" cname="gtk_progress_bar_set_fraction">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="fraction"/>
+          <parameter type="gdouble" name="fraction" />
         </parameters>
       </method>
       <method name="SetOrientation" cname="gtk_progress_bar_set_orientation">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkProgressBarOrientation" name="orientation"/>
+          <parameter type="GtkProgressBarOrientation" name="orientation" />
         </parameters>
       </method>
       <method name="SetPulseStep" cname="gtk_progress_bar_set_pulse_step">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="fraction"/>
+          <parameter type="gdouble" name="fraction" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_progress_bar_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
     </object>
     <object name="RadioButton" cname="GtkRadioButton" parent="GtkCheckButton">
-      <field cname="group" type="GSList*"/>
-      <property name="Group" cname="group" type="GtkRadioButton" writeable="true" hidden="1"/>
+      <field cname="group" type="GSList*" />
+      <property name="Group" cname="group" type="GtkRadioButton" writeable="true" hidden="1" />
       <method name="GetGroup" cname="gtk_radio_button_get_group">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="GetType" cname="gtk_radio_button_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_radio_button_new">
         <parameters>
-          <parameter type="GSList*" name="group" null_ok="1"/>
+          <parameter type="GSList*" name="group" null_ok="1" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_button_new_from_widget">
         <parameters>
-          <parameter type="GtkRadioButton*" name="group"/>
+          <parameter type="GtkRadioButton*" name="group" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_button_new_with_label">
         <parameters>
-          <parameter type="GSList*" name="group" null_ok="1"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GSList*" name="group" null_ok="1" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_button_new_with_label_from_widget">
         <parameters>
-          <parameter type="GtkRadioButton*" name="group"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GtkRadioButton*" name="group" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_button_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="GSList*" name="group" null_ok="1"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GSList*" name="group" null_ok="1" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_button_new_with_mnemonic_from_widget">
         <parameters>
-          <parameter type="GtkRadioButton*" name="group"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GtkRadioButton*" name="group" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetGroup" cname="gtk_radio_button_set_group">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GSList*" name="group"/>
+          <parameter type="GSList*" name="group" />
         </parameters>
       </method>
     </object>
     <object name="RadioMenuItem" cname="GtkRadioMenuItem" parent="GtkCheckMenuItem">
-      <field cname="group" type="GSList*"/>
+      <field cname="group" type="GSList*" />
       <method name="GetGroup" cname="gtk_radio_menu_item_get_group">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="GetType" cname="gtk_radio_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_radio_menu_item_new">
         <parameters>
-          <parameter type="GSList*" name="group"/>
+          <parameter type="GSList*" name="group" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_menu_item_new_with_label">
         <parameters>
-          <parameter type="GSList*" name="group" null_ok="1"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GSList*" name="group" null_ok="1" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_radio_menu_item_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="GSList*" name="group"/>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="GSList*" name="group" />
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetGroup" cname="gtk_radio_menu_item_set_group">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GSList*" name="group"/>
+          <parameter type="GSList*" name="group" />
         </parameters>
       </method>
     </object>
     <object name="Range" cname="GtkRange" parent="GtkWidget">
-      <field cname="adjustment" type="GtkAdjustment*"/>
-      <field cname="update_policy" type="GtkUpdateType"/>
-      <field cname="inverted" bits="1" type="guint"/>
-      <field cname="flippable" bits="1" type="guint"/>
-      <field cname="has_stepper_a" bits="1" type="guint"/>
-      <field cname="has_stepper_b" bits="1" type="guint"/>
-      <field cname="has_stepper_c" bits="1" type="guint"/>
-      <field cname="has_stepper_d" bits="1" type="guint"/>
-      <field cname="need_recalc" bits="1" type="guint"/>
-      <field cname="slider_size_fixed" bits="1" type="guint"/>
-      <field cname="min_slider_size" type="gint"/>
-      <field cname="orientation" type="GtkOrientation"/>
-      <field cname="range_rect" type="GdkRectangle"/>
-      <field cname="slider_start" type="gint"/>
-      <field cname="slider_end" type="gint"/>
-      <field cname="round_digits" type="gint"/>
-      <field cname="trough_click_forward" bits="1" type="guint"/>
-      <field cname="update_pending" bits="1" type="guint"/>
-      <field cname="layout" type="GtkRangeLayout*"/>
-      <field cname="timer" type="GtkRangeStepTimer*"/>
-      <field cname="slide_initial_slider_position" type="gint"/>
-      <field cname="slide_initial_coordinate" type="gint"/>
-      <field cname="update_timeout_id" type="guint"/>
-      <field cname="event_window" type="GdkWindow*"/>
+      <field cname="adjustment" type="GtkAdjustment*" />
+      <field cname="update_policy" type="GtkUpdateType" />
+      <field cname="inverted" bits="1" type="guint" />
+      <field cname="flippable" bits="1" type="guint" />
+      <field cname="has_stepper_a" bits="1" type="guint" />
+      <field cname="has_stepper_b" bits="1" type="guint" />
+      <field cname="has_stepper_c" bits="1" type="guint" />
+      <field cname="has_stepper_d" bits="1" type="guint" />
+      <field cname="need_recalc" bits="1" type="guint" />
+      <field cname="slider_size_fixed" bits="1" type="guint" />
+      <field cname="min_slider_size" type="gint" />
+      <field cname="orientation" type="GtkOrientation" />
+      <field cname="range_rect" type="GdkRectangle" />
+      <field cname="slider_start" type="gint" />
+      <field cname="slider_end" type="gint" />
+      <field cname="round_digits" type="gint" />
+      <field cname="trough_click_forward" bits="1" type="guint" />
+      <field cname="update_pending" bits="1" type="guint" />
+      <field cname="layout" type="GtkRangeLayout*" />
+      <field cname="timer" type="GtkRangeStepTimer*" />
+      <field cname="slide_initial_slider_position" type="gint" />
+      <field cname="slide_initial_coordinate" type="gint" />
+      <field cname="update_timeout_id" type="guint" />
+      <field cname="event_window" type="GdkWindow*" />
       <signal name="ValueChanged" cname="value_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRange*" name="range"/>
+          <parameter type="GtkRange*" name="range" />
         </parameters>
       </signal>
       <signal name="AdjustBounds" cname="adjust_bounds" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRange*" name="range"/>
-          <parameter type="gdouble" name="new_value"/>
+          <parameter type="GtkRange*" name="range" />
+          <parameter type="gdouble" name="new_value" />
         </parameters>
       </signal>
       <signal name="MoveSlider" cname="move_slider" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRange*" name="range"/>
-          <parameter type="GtkScrollType" name="scroll"/>
+          <parameter type="GtkRange*" name="range" />
+          <parameter type="GtkScrollType" name="scroll" />
         </parameters>
       </signal>
-      <property name="UpdatePolicy" cname="update_policy" type="GtkUpdateType" readable="true" writeable="true"/>
-      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true"/>
-      <property name="Inverted" cname="inverted" type="gboolean" readable="true" writeable="true"/>
+      <property name="UpdatePolicy" cname="update_policy" type="GtkUpdateType" readable="true" writeable="true" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="Inverted" cname="inverted" type="gboolean" readable="true" writeable="true" />
       <method name="GetAdjustment" cname="gtk_range_get_adjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetInverted" cname="gtk_range_get_inverted">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_range_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUpdatePolicy" cname="gtk_range_get_update_policy">
-        <return-type type="GtkUpdateType"/>
+        <return-type type="GtkUpdateType" />
       </method>
       <method name="GetValue" cname="gtk_range_get_value">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="SetAdjustment" cname="gtk_range_set_adjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetIncrements" cname="gtk_range_set_increments">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="step"/>
-          <parameter type="gdouble" name="page"/>
+          <parameter type="gdouble" name="step" />
+          <parameter type="gdouble" name="page" />
         </parameters>
       </method>
       <method name="SetInverted" cname="gtk_range_set_inverted">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetRange" cname="gtk_range_set_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
+          <parameter type="gdouble" name="min" />
+          <parameter type="gdouble" name="max" />
         </parameters>
       </method>
       <method name="SetUpdatePolicy" cname="gtk_range_set_update_policy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkUpdateType" name="policy"/>
+          <parameter type="GtkUpdateType" name="policy" />
         </parameters>
       </method>
       <method name="SetValue" cname="gtk_range_set_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="value"/>
+          <parameter type="gdouble" name="value" />
         </parameters>
       </method>
     </object>
     <object name="RcStyle" cname="GtkRcStyle" parent="GObject">
-      <field cname="name" type="gchar*"/>
-      <field cname="bg_pixmap_name" array_len="5" type="gchar*"/>
-      <field cname="font_desc" type="PangoFontDescription*"/>
-      <field cname="color_flags" array_len="5" type="GtkRcFlags"/>
-      <field cname="fg" array_len="5" type="GdkColor"/>
-      <field cname="bg" array_len="5" type="GdkColor"/>
-      <field cname="text" array_len="5" type="GdkColor"/>
-      <field cname="base" array_len="5" type="GdkColor"/>
-      <field cname="xthickness" type="gint"/>
-      <field cname="ythickness" type="gint"/>
-      <field cname="rc_properties" type="GArray*"/>
-      <field cname="rc_style_lists" type="GSList*"/>
-      <field cname="icon_factories" type="GSList*"/>
-      <field cname="engine_specified" bits="1" type="guint"/>
+      <field cname="name" type="gchar*" />
+      <field cname="bg_pixmap_name" array_len="5" type="gchar*" />
+      <field cname="font_desc" type="PangoFontDescription*" />
+      <field cname="color_flags" array_len="5" type="GtkRcFlags" />
+      <field cname="fg" array_len="5" type="GdkColor" />
+      <field cname="bg" array_len="5" type="GdkColor" />
+      <field cname="text" array_len="5" type="GdkColor" />
+      <field cname="base" array_len="5" type="GdkColor" />
+      <field cname="xthickness" type="gint" />
+      <field cname="ythickness" type="gint" />
+      <field cname="rc_properties" type="GArray*" />
+      <field cname="rc_style_lists" type="GSList*" />
+      <field cname="icon_factories" type="GSList*" />
+      <field cname="engine_specified" bits="1" type="guint" />
       <method name="Copy" cname="gtk_rc_style_copy">
-        <return-type type="GtkRcStyle*"/>
+        <return-type type="GtkRcStyle*" />
       </method>
       <method name="GetType" cname="gtk_rc_style_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_rc_style_new"/>
+      <constructor cname="gtk_rc_style_new" />
       <method name="Ref" cname="gtk_rc_style_ref" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unref" cname="gtk_rc_style_unref" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Ruler" cname="GtkRuler" parent="GtkWidget">
-      <field cname="backing_store" type="GdkPixmap*"/>
-      <field cname="non_gr_exp_gc" type="GdkGC*"/>
-      <field cname="metric" type="GtkRulerMetric*"/>
-      <field cname="xsrc" type="gint"/>
-      <field cname="ysrc" type="gint"/>
-      <field cname="slider_size" type="gint"/>
-      <field cname="lower" type="gdouble"/>
-      <field cname="upper" type="gdouble"/>
-      <field cname="position" type="gdouble"/>
-      <field cname="max_size" type="gdouble"/>
-      <property name="Lower" cname="lower" type="gdouble" readable="true" writeable="true"/>
-      <property name="Upper" cname="upper" type="gdouble" readable="true" writeable="true"/>
-      <property name="Position" cname="position" type="gdouble" readable="true" writeable="true"/>
-      <property name="MaxSize" cname="max_size" type="gdouble" readable="true" writeable="true"/>
+      <field cname="backing_store" type="GdkPixmap*" />
+      <field cname="non_gr_exp_gc" type="GdkGC*" />
+      <field cname="metric" type="GtkRulerMetric*" />
+      <field cname="xsrc" type="gint" />
+      <field cname="ysrc" type="gint" />
+      <field cname="slider_size" type="gint" />
+      <field cname="lower" type="gdouble" />
+      <field cname="upper" type="gdouble" />
+      <field cname="position" type="gdouble" />
+      <field cname="max_size" type="gdouble" />
+      <property name="Lower" cname="lower" type="gdouble" readable="true" writeable="true" />
+      <property name="Upper" cname="upper" type="gdouble" readable="true" writeable="true" />
+      <property name="Position" cname="position" type="gdouble" readable="true" writeable="true" />
+      <property name="MaxSize" cname="max_size" type="gdouble" readable="true" writeable="true" />
       <method name="DrawPos" cname="gtk_ruler_draw_pos">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="DrawTicks" cname="gtk_ruler_draw_ticks">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetMetric" cname="gtk_ruler_get_metric">
-        <return-type type="GtkMetricType"/>
+        <return-type type="GtkMetricType" />
       </method>
       <method name="GetRange" cname="gtk_ruler_get_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble*" name="lower"/>
-          <parameter type="gdouble*" name="upper"/>
-          <parameter type="gdouble*" name="position"/>
-          <parameter type="gdouble*" name="max_size"/>
+          <parameter type="gdouble*" name="lower" />
+          <parameter type="gdouble*" name="upper" />
+          <parameter type="gdouble*" name="position" />
+          <parameter type="gdouble*" name="max_size" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_ruler_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SetMetric" cname="gtk_ruler_set_metric">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkMetricType" name="metric"/>
+          <parameter type="GtkMetricType" name="metric" />
         </parameters>
       </method>
       <method name="SetRange" cname="gtk_ruler_set_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="lower"/>
-          <parameter type="gdouble" name="upper"/>
-          <parameter type="gdouble" name="position"/>
-          <parameter type="gdouble" name="max_size"/>
+          <parameter type="gdouble" name="lower" />
+          <parameter type="gdouble" name="upper" />
+          <parameter type="gdouble" name="position" />
+          <parameter type="gdouble" name="max_size" />
         </parameters>
       </method>
     </object>
     <object name="Scale" cname="GtkScale" parent="GtkRange">
-      <field cname="digits" type="gint"/>
-      <field cname="draw_value" bits="1" type="guint"/>
-      <field cname="value_pos" bits="2" type="guint"/>
+      <field cname="digits" type="gint" />
+      <field cname="draw_value" bits="1" type="guint" />
+      <field cname="value_pos" bits="2" type="guint" />
       <signal name="FormatValue" cname="format_value" when="LAST">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="GtkScale*" name="scale"/>
-          <parameter type="gdouble" name="value"/>
+          <parameter type="GtkScale*" name="scale" />
+          <parameter type="gdouble" name="value" />
         </parameters>
       </signal>
-      <property name="Digits" cname="digits" type="gint" readable="true" writeable="true"/>
-      <property name="DrawValue" cname="draw_value" type="gboolean" readable="true" writeable="true"/>
-      <property name="ValuePos" cname="value_pos" type="GtkPositionType" readable="true" writeable="true"/>
+      <property name="Digits" cname="digits" type="gint" readable="true" writeable="true" />
+      <property name="DrawValue" cname="draw_value" type="gboolean" readable="true" writeable="true" />
+      <property name="ValuePos" cname="value_pos" type="GtkPositionType" readable="true" writeable="true" />
       <method name="GetDigits" cname="gtk_scale_get_digits">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetDrawValue" cname="gtk_scale_get_draw_value">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_scale_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetValuePos" cname="gtk_scale_get_value_pos">
-        <return-type type="GtkPositionType"/>
+        <return-type type="GtkPositionType" />
       </method>
       <method name="SetDigits" cname="gtk_scale_set_digits">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="digits"/>
+          <parameter type="gint" name="digits" />
         </parameters>
       </method>
       <method name="SetDrawValue" cname="gtk_scale_set_draw_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="draw_value"/>
+          <parameter type="gboolean" name="draw_value" />
         </parameters>
       </method>
       <method name="SetValuePos" cname="gtk_scale_set_value_pos">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPositionType" name="pos"/>
+          <parameter type="GtkPositionType" name="pos" />
         </parameters>
       </method>
     </object>
     <object name="Scrollbar" cname="GtkScrollbar" parent="GtkRange">
       <method name="GetType" cname="gtk_scrollbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="ScrolledWindow" cname="GtkScrolledWindow" parent="GtkBin" disabledefaultconstructor="1">
-      <field cname="hscrollbar" type="GtkWidget*"/>
-      <field cname="vscrollbar" type="GtkWidget*"/>
-      <field cname="hscrollbar_policy" bits="2" type="guint"/>
-      <field cname="vscrollbar_policy" bits="2" type="guint"/>
-      <field cname="hscrollbar_visible" bits="1" type="guint"/>
-      <field cname="vscrollbar_visible" bits="1" type="guint"/>
-      <field cname="window_placement" bits="2" type="guint"/>
-      <field cname="focus_out" bits="1" type="guint"/>
-      <field cname="shadow_type" type="guint16"/>
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true"/>
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true"/>
-      <property name="HscrollbarPolicy" cname="hscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true"/>
-      <property name="VscrollbarPolicy" cname="vscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true"/>
-      <property name="WindowPlacement" cname="window_placement" type="GtkCornerType" readable="true" writeable="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true"/>
+      <field cname="hscrollbar" type="GtkWidget*" />
+      <field cname="vscrollbar" type="GtkWidget*" />
+      <field cname="hscrollbar_policy" bits="2" type="guint" />
+      <field cname="vscrollbar_policy" bits="2" type="guint" />
+      <field cname="hscrollbar_visible" bits="1" type="guint" />
+      <field cname="vscrollbar_visible" bits="1" type="guint" />
+      <field cname="window_placement" bits="2" type="guint" />
+      <field cname="focus_out" bits="1" type="guint" />
+      <field cname="shadow_type" type="guint16" />
+      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="HscrollbarPolicy" cname="hscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
+      <property name="VscrollbarPolicy" cname="vscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
+      <property name="WindowPlacement" cname="window_placement" type="GtkCornerType" readable="true" writeable="true" />
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" />
       <signal name="ScrollChild" cname="scroll_child" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkScrolledWindow*" name="scrolled_window"/>
-          <parameter type="GtkScrollType" name="scroll"/>
-          <parameter type="gboolean" name="horizontal"/>
+          <parameter type="GtkScrolledWindow*" name="scrolled_window" />
+          <parameter type="GtkScrollType" name="scroll" />
+          <parameter type="gboolean" name="horizontal" />
         </parameters>
       </signal>
       <signal name="MoveFocusOut" cname="move_focus_out" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkScrolledWindow*" name="scrolled_window"/>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkScrolledWindow*" name="scrolled_window" />
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
       <method name="AddWithViewport" cname="gtk_scrolled_window_add_with_viewport">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
       <method name="GetHadjustment" cname="gtk_scrolled_window_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetPlacement" cname="gtk_scrolled_window_get_placement">
-        <return-type type="GtkCornerType"/>
+        <return-type type="GtkCornerType" />
       </method>
       <method name="GetPolicy" cname="gtk_scrolled_window_get_policy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPolicyType*" name="hscrollbar_policy" pass_as="out"/>
-          <parameter type="GtkPolicyType*" name="vscrollbar_policy" pass_as="out"/>
+          <parameter type="GtkPolicyType*" name="hscrollbar_policy" pass_as="out" />
+          <parameter type="GtkPolicyType*" name="vscrollbar_policy" pass_as="out" />
         </parameters>
       </method>
       <method name="GetShadowType" cname="gtk_scrolled_window_get_shadow_type">
-        <return-type type="GtkShadowType"/>
+        <return-type type="GtkShadowType" />
       </method>
       <method name="GetType" cname="gtk_scrolled_window_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVadjustment" cname="gtk_scrolled_window_get_vadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <constructor cname="gtk_scrolled_window_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1"/>
-          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1" />
+          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1" />
         </parameters>
       </constructor>
       <method name="SetHadjustment" cname="gtk_scrolled_window_set_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" />
         </parameters>
       </method>
       <method name="SetPlacement" cname="gtk_scrolled_window_set_placement">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCornerType" name="window_placement"/>
+          <parameter type="GtkCornerType" name="window_placement" />
         </parameters>
       </method>
       <method name="SetPolicy" cname="gtk_scrolled_window_set_policy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPolicyType" name="hscrollbar_policy"/>
-          <parameter type="GtkPolicyType" name="vscrollbar_policy"/>
+          <parameter type="GtkPolicyType" name="hscrollbar_policy" />
+          <parameter type="GtkPolicyType" name="vscrollbar_policy" />
         </parameters>
       </method>
       <method name="SetShadowType" cname="gtk_scrolled_window_set_shadow_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkShadowType" name="type"/>
+          <parameter type="GtkShadowType" name="type" />
         </parameters>
       </method>
       <method name="SetVadjustment" cname="gtk_scrolled_window_set_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" />
         </parameters>
       </method>
     </object>
     <object name="Separator" cname="GtkSeparator" parent="GtkWidget">
       <method name="GetType" cname="gtk_separator_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="SeparatorMenuItem" cname="GtkSeparatorMenuItem" parent="GtkMenuItem">
       <method name="GetType" cname="gtk_separator_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_separator_menu_item_new"/>
+      <constructor cname="gtk_separator_menu_item_new" />
     </object>
     <object name="Settings" cname="GtkSettings" parent="GObject">
-      <field cname="queued_settings" type="GData*"/>
-      <field cname="property_values" type="GtkSettingsPropertyValue*"/>
-      <field cname="rc_context" type="GtkRcContext*"/>
-      <field cname="screen" type="GdkScreen*"/>
+      <field cname="queued_settings" type="GData*" />
+      <field cname="property_values" type="GtkSettingsPropertyValue*" />
+      <field cname="rc_context" type="GtkRcContext*" />
+      <field cname="screen" type="GdkScreen*" />
       <method name="GetDefault" cname="gtk_settings_get_default" shared="true">
-        <return-type type="GtkSettings*"/>
+        <return-type type="GtkSettings*" />
       </method>
       <method name="GetForScreen" cname="gtk_settings_get_for_screen" shared="true">
-        <return-type type="GtkSettings*"/>
+        <return-type type="GtkSettings*" />
         <parameters>
-          <parameter type="GdkScreen*" name="screen"/>
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_settings_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="InstallProperty" cname="gtk_settings_install_property" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GParamSpec*" name="pspec"/>
+          <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </method>
       <method name="InstallPropertyParser" cname="gtk_settings_install_property_parser" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GParamSpec*" name="pspec"/>
-          <parameter type="GtkRcPropertyParser" name="parser"/>
+          <parameter type="GParamSpec*" name="pspec" />
+          <parameter type="GtkRcPropertyParser" name="parser" />
         </parameters>
       </method>
       <method name="SetDoubleProperty" cname="gtk_settings_set_double_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="gdouble" name="v_double"/>
-          <parameter type="const-gchar*" name="origin"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="gdouble" name="v_double" />
+          <parameter type="const-gchar*" name="origin" />
         </parameters>
       </method>
       <method name="SetLongProperty" cname="gtk_settings_set_long_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="glong" name="v_long"/>
-          <parameter type="const-gchar*" name="origin"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="glong" name="v_long" />
+          <parameter type="const-gchar*" name="origin" />
         </parameters>
       </method>
       <method name="SetPropertyValue" cname="gtk_settings_set_property_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkSettingsValue*" name="svalue"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-GtkSettingsValue*" name="svalue" />
         </parameters>
       </method>
       <method name="SetStringProperty" cname="gtk_settings_set_string_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-gchar*" name="v_string"/>
-          <parameter type="const-gchar*" name="origin"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-gchar*" name="v_string" />
+          <parameter type="const-gchar*" name="origin" />
         </parameters>
       </method>
     </object>
     <object name="SizeGroup" cname="GtkSizeGroup" parent="GObject">
-      <field cname="widgets" type="GSList*"/>
-      <field cname="mode" type="guint8"/>
-      <field cname="have_width" bits="1" type="guint"/>
-      <field cname="have_height" bits="1" type="guint"/>
-      <field cname="requisition" type="GtkRequisition"/>
-      <property name="Mode" cname="mode" type="GtkSizeGroupMode" readable="true" writeable="true"/>
+      <field cname="widgets" type="GSList*" />
+      <field cname="mode" type="guint8" />
+      <field cname="have_width" bits="1" type="guint" />
+      <field cname="have_height" bits="1" type="guint" />
+      <field cname="requisition" type="GtkRequisition" />
+      <property name="Mode" cname="mode" type="GtkSizeGroupMode" readable="true" writeable="true" />
       <method name="AddWidget" cname="gtk_size_group_add_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="GetMode" cname="gtk_size_group_get_mode">
-        <return-type type="GtkSizeGroupMode"/>
+        <return-type type="GtkSizeGroupMode" />
       </method>
       <method name="GetType" cname="gtk_size_group_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_size_group_new">
         <parameters>
-          <parameter type="GtkSizeGroupMode" name="mode"/>
+          <parameter type="GtkSizeGroupMode" name="mode" />
         </parameters>
       </constructor>
       <method name="RemoveWidget" cname="gtk_size_group_remove_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="SetMode" cname="gtk_size_group_set_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSizeGroupMode" name="mode"/>
+          <parameter type="GtkSizeGroupMode" name="mode" />
         </parameters>
       </method>
     </object>
     <object name="Socket" cname="GtkSocket" parent="GtkContainer">
-      <field cname="request_width" type="guint16"/>
-      <field cname="request_height" type="guint16"/>
-      <field cname="current_width" type="guint16"/>
-      <field cname="current_height" type="guint16"/>
-      <field cname="plug_window" type="GdkWindow*"/>
-      <field cname="plug_widget" type="GtkWidget*"/>
-      <field cname="xembed_version" type="gshort"/>
-      <field cname="same_app" bits="1" type="guint"/>
-      <field cname="focus_in" bits="1" type="guint"/>
-      <field cname="have_size" bits="1" type="guint"/>
-      <field cname="need_map" bits="1" type="guint"/>
-      <field cname="is_mapped" bits="1" type="guint"/>
-      <field cname="active" bits="1" type="guint"/>
-      <field cname="accel_group" type="GtkAccelGroup*"/>
-      <field cname="toplevel" type="GtkWidget*"/>
+      <field cname="request_width" type="guint16" />
+      <field cname="request_height" type="guint16" />
+      <field cname="current_width" type="guint16" />
+      <field cname="current_height" type="guint16" />
+      <field cname="plug_window" type="GdkWindow*" />
+      <field cname="plug_widget" type="GtkWidget*" />
+      <field cname="xembed_version" type="gshort" />
+      <field cname="same_app" bits="1" type="guint" />
+      <field cname="focus_in" bits="1" type="guint" />
+      <field cname="have_size" bits="1" type="guint" />
+      <field cname="need_map" bits="1" type="guint" />
+      <field cname="is_mapped" bits="1" type="guint" />
+      <field cname="active" bits="1" type="guint" />
+      <field cname="accel_group" type="GtkAccelGroup*" />
+      <field cname="toplevel" type="GtkWidget*" />
       <signal name="PlugAdded" cname="plug_added" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSocket*" name="socket_"/>
+          <parameter type="GtkSocket*" name="socket_" />
         </parameters>
       </signal>
       <signal name="PlugRemoved" cname="plug_removed" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkSocket*" name="socket_"/>
+          <parameter type="GtkSocket*" name="socket_" />
         </parameters>
       </signal>
       <method name="AddId" cname="gtk_socket_add_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkNativeWindow" name="window_id"/>
+          <parameter type="GdkNativeWindow" name="window_id" />
         </parameters>
       </method>
       <method name="GetId" cname="gtk_socket_get_id">
-        <return-type type="GdkNativeWindow"/>
+        <return-type type="GdkNativeWindow" />
       </method>
       <method name="GetType" cname="gtk_socket_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_socket_new"/>
+      <constructor cname="gtk_socket_new" />
     </object>
     <object name="SpinButton" cname="GtkSpinButton" parent="GtkEntry">
-      <field cname="adjustment" type="GtkAdjustment*"/>
-      <field cname="panel" type="GdkWindow*"/>
-      <field cname="timer" type="guint32"/>
-      <field cname="climb_rate" type="gdouble"/>
-      <field cname="timer_step" type="gdouble"/>
-      <field cname="update_policy" type="GtkSpinButtonUpdatePolicy"/>
-      <field cname="in_child" bits="2" type="guint"/>
-      <field cname="click_child" bits="2" type="guint"/>
-      <field cname="button" bits="2" type="guint"/>
-      <field cname="need_timer" bits="1" type="guint"/>
-      <field cname="timer_calls" bits="3" type="guint"/>
-      <field cname="digits" bits="10" type="guint"/>
-      <field cname="numeric" bits="1" type="guint"/>
-      <field cname="wrap" bits="1" type="guint"/>
-      <field cname="snap_to_ticks" bits="1" type="guint"/>
-      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="ClimbRate" cname="climb_rate" type="gdouble" readable="true" writeable="true"/>
-      <property name="Digits" cname="digits" type="guint" readable="true" writeable="true"/>
-      <property name="SnapToTicks" cname="snap_to_ticks" type="gboolean" readable="true" writeable="true"/>
-      <property name="Numeric" cname="numeric" type="gboolean" readable="true" writeable="true"/>
-      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true"/>
-      <property name="UpdatePolicy" cname="update_policy" type="GtkSpinButtonUpdatePolicy" readable="true" writeable="true"/>
-      <property name="Value" cname="value" type="gdouble" readable="true" writeable="true"/>
+      <field cname="adjustment" type="GtkAdjustment*" />
+      <field cname="panel" type="GdkWindow*" />
+      <field cname="timer" type="guint32" />
+      <field cname="climb_rate" type="gdouble" />
+      <field cname="timer_step" type="gdouble" />
+      <field cname="update_policy" type="GtkSpinButtonUpdatePolicy" />
+      <field cname="in_child" bits="2" type="guint" />
+      <field cname="click_child" bits="2" type="guint" />
+      <field cname="button" bits="2" type="guint" />
+      <field cname="need_timer" bits="1" type="guint" />
+      <field cname="timer_calls" bits="3" type="guint" />
+      <field cname="digits" bits="10" type="guint" />
+      <field cname="numeric" bits="1" type="guint" />
+      <field cname="wrap" bits="1" type="guint" />
+      <field cname="snap_to_ticks" bits="1" type="guint" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="ClimbRate" cname="climb_rate" type="gdouble" readable="true" writeable="true" />
+      <property name="Digits" cname="digits" type="guint" readable="true" writeable="true" />
+      <property name="SnapToTicks" cname="snap_to_ticks" type="gboolean" readable="true" writeable="true" />
+      <property name="Numeric" cname="numeric" type="gboolean" readable="true" writeable="true" />
+      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true" />
+      <property name="UpdatePolicy" cname="update_policy" type="GtkSpinButtonUpdatePolicy" readable="true" writeable="true" />
+      <property name="Value" cname="value" type="gdouble" readable="true" writeable="true" />
       <signal name="Input" cname="input" when="LAST">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkSpinButton*" name="spin_button"/>
-          <parameter type="gdouble*" name="new_value"/>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+          <parameter type="gdouble*" name="new_value" />
         </parameters>
       </signal>
       <signal name="Output" cname="output" when="LAST">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkSpinButton*" name="spin_button"/>
+          <parameter type="GtkSpinButton*" name="spin_button" />
         </parameters>
       </signal>
       <signal name="ValueChanged" cname="value_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSpinButton*" name="spin_button"/>
+          <parameter type="GtkSpinButton*" name="spin_button" />
         </parameters>
       </signal>
       <signal name="ChangeValue" cname="change_value" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSpinButton*" name="spin_button"/>
-          <parameter type="GtkScrollType" name="scroll"/>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+          <parameter type="GtkScrollType" name="scroll" />
         </parameters>
       </signal>
       <implements>
-        <interface cname="GtkEditable"/>
+        <interface cname="GtkEditable" />
       </implements>
       <method name="Configure" cname="gtk_spin_button_configure">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
-          <parameter type="gdouble" name="climb_rate"/>
-          <parameter type="guint" name="digits"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
+          <parameter type="gdouble" name="climb_rate" />
+          <parameter type="guint" name="digits" />
         </parameters>
       </method>
       <method name="GetAdjustment" cname="gtk_spin_button_get_adjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetDigits" cname="gtk_spin_button_get_digits">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetIncrements" cname="gtk_spin_button_get_increments">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble*" name="step"/>
-          <parameter type="gdouble*" name="page"/>
+          <parameter type="gdouble*" name="step" />
+          <parameter type="gdouble*" name="page" />
         </parameters>
       </method>
       <method name="GetNumeric" cname="gtk_spin_button_get_numeric">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetRange" cname="gtk_spin_button_get_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble*" name="min"/>
-          <parameter type="gdouble*" name="max"/>
+          <parameter type="gdouble*" name="min" />
+          <parameter type="gdouble*" name="max" />
         </parameters>
       </method>
       <method name="GetSnapToTicks" cname="gtk_spin_button_get_snap_to_ticks">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_spin_button_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUpdatePolicy" cname="gtk_spin_button_get_update_policy">
-        <return-type type="GtkSpinButtonUpdatePolicy"/>
+        <return-type type="GtkSpinButtonUpdatePolicy" />
       </method>
       <method name="GetValue" cname="gtk_spin_button_get_value">
-        <return-type type="gdouble"/>
+        <return-type type="gdouble" />
       </method>
       <method name="GetValueAsInt" cname="gtk_spin_button_get_value_as_int">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetWrap" cname="gtk_spin_button_get_wrap">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <constructor cname="gtk_spin_button_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
-          <parameter type="gdouble" name="climb_rate"/>
-          <parameter type="guint" name="digits"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
+          <parameter type="gdouble" name="climb_rate" />
+          <parameter type="guint" name="digits" />
         </parameters>
       </constructor>
       <constructor cname="gtk_spin_button_new_with_range">
         <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
-          <parameter type="gdouble" name="step"/>
+          <parameter type="gdouble" name="min" />
+          <parameter type="gdouble" name="max" />
+          <parameter type="gdouble" name="step" />
         </parameters>
       </constructor>
       <method name="SetAdjustment" cname="gtk_spin_button_set_adjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetDigits" cname="gtk_spin_button_set_digits">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="digits"/>
+          <parameter type="guint" name="digits" />
         </parameters>
       </method>
       <method name="SetIncrements" cname="gtk_spin_button_set_increments">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="step"/>
-          <parameter type="gdouble" name="page"/>
+          <parameter type="gdouble" name="step" />
+          <parameter type="gdouble" name="page" />
         </parameters>
       </method>
       <method name="SetNumeric" cname="gtk_spin_button_set_numeric">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="numeric"/>
+          <parameter type="gboolean" name="numeric" />
         </parameters>
       </method>
       <method name="SetRange" cname="gtk_spin_button_set_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
+          <parameter type="gdouble" name="min" />
+          <parameter type="gdouble" name="max" />
         </parameters>
       </method>
       <method name="SetSnapToTicks" cname="gtk_spin_button_set_snap_to_ticks">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="snap_to_ticks"/>
+          <parameter type="gboolean" name="snap_to_ticks" />
         </parameters>
       </method>
       <method name="SetUpdatePolicy" cname="gtk_spin_button_set_update_policy">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSpinButtonUpdatePolicy" name="policy"/>
+          <parameter type="GtkSpinButtonUpdatePolicy" name="policy" />
         </parameters>
       </method>
       <method name="SetValue" cname="gtk_spin_button_set_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="value"/>
+          <parameter type="gdouble" name="value" />
         </parameters>
       </method>
       <method name="SetWrap" cname="gtk_spin_button_set_wrap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="wrap"/>
+          <parameter type="gboolean" name="wrap" />
         </parameters>
       </method>
       <method name="Spin" cname="gtk_spin_button_spin">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSpinType" name="direction"/>
-          <parameter type="gdouble" name="increment"/>
+          <parameter type="GtkSpinType" name="direction" />
+          <parameter type="gdouble" name="increment" />
         </parameters>
       </method>
       <method name="Update" cname="gtk_spin_button_update">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Statusbar" cname="GtkStatusbar" parent="GtkHBox">
-      <field cname="frame" type="GtkWidget*"/>
-      <field cname="label" type="GtkWidget*"/>
-      <field cname="messages" type="GSList*"/>
-      <field cname="keys" type="GSList*"/>
-      <field cname="seq_context_id" type="guint"/>
-      <field cname="seq_message_id" type="guint"/>
-      <field cname="grip_window" type="GdkWindow*"/>
-      <field cname="has_resize_grip" bits="1" type="guint"/>
+      <field cname="frame" type="GtkWidget*" />
+      <field cname="label" type="GtkWidget*" />
+      <field cname="messages" type="GSList*" />
+      <field cname="keys" type="GSList*" />
+      <field cname="seq_context_id" type="guint" />
+      <field cname="seq_message_id" type="guint" />
+      <field cname="grip_window" type="GdkWindow*" />
+      <field cname="has_resize_grip" bits="1" type="guint" />
       <signal name="TextPushed" cname="text_pushed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStatusbar*" name="statusbar"/>
-          <parameter type="guint" name="context_id"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="GtkStatusbar*" name="statusbar" />
+          <parameter type="guint" name="context_id" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </signal>
       <signal name="TextPopped" cname="text_popped" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStatusbar*" name="statusbar"/>
-          <parameter type="guint" name="context_id"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="GtkStatusbar*" name="statusbar" />
+          <parameter type="guint" name="context_id" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </signal>
       <method name="GetContextId" cname="gtk_statusbar_get_context_id">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="const-gchar*" name="context_description"/>
+          <parameter type="const-gchar*" name="context_description" />
         </parameters>
       </method>
       <method name="GetHasResizeGrip" cname="gtk_statusbar_get_has_resize_grip">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_statusbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_statusbar_new"/>
+      <constructor cname="gtk_statusbar_new" />
       <method name="Pop" cname="gtk_statusbar_pop">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="context_id"/>
+          <parameter type="guint" name="context_id" />
         </parameters>
       </method>
       <method name="Push" cname="gtk_statusbar_push">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint" name="context_id"/>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="guint" name="context_id" />
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_statusbar_remove">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="context_id"/>
-          <parameter type="guint" name="message_id"/>
+          <parameter type="guint" name="context_id" />
+          <parameter type="guint" name="message_id" />
         </parameters>
       </method>
       <method name="SetHasResizeGrip" cname="gtk_statusbar_set_has_resize_grip">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
     </object>
     <object name="Style" cname="GtkStyle" parent="GObject">
-      <field cname="fg" array_len="5" type="GdkColor"/>
-      <field cname="bg" array_len="5" type="GdkColor"/>
-      <field cname="light" array_len="5" type="GdkColor"/>
-      <field cname="dark" array_len="5" type="GdkColor"/>
-      <field cname="mid" array_len="5" type="GdkColor"/>
-      <field cname="text" array_len="5" type="GdkColor"/>
-      <field cname="base" array_len="5" type="GdkColor"/>
-      <field cname="text_aa" array_len="5" type="GdkColor"/>
-      <field cname="black" type="GdkColor"/>
-      <field cname="white" type="GdkColor"/>
-      <field cname="font_desc" type="PangoFontDescription*"/>
-      <field cname="xthickness" type="gint"/>
-      <field cname="ythickness" type="gint"/>
-      <field cname="fg_gc" array_len="5" type="GdkGC*"/>
-      <field cname="bg_gc" array_len="5" type="GdkGC*"/>
-      <field cname="light_gc" array_len="5" type="GdkGC*"/>
-      <field cname="dark_gc" array_len="5" type="GdkGC*"/>
-      <field cname="mid_gc" array_len="5" type="GdkGC*"/>
-      <field cname="text_gc" array_len="5" type="GdkGC*"/>
-      <field cname="base_gc" array_len="5" type="GdkGC*"/>
-      <field cname="text_aa_gc" array_len="5" type="GdkGC*"/>
-      <field cname="black_gc" type="GdkGC*"/>
-      <field cname="white_gc" type="GdkGC*"/>
-      <field cname="bg_pixmap" array_len="5" type="GdkPixmap*"/>
-      <field cname="attach_count" type="gint"/>
-      <field cname="depth" type="gint"/>
-      <field cname="colormap" type="GdkColormap*"/>
-      <field cname="private_font" type="GdkFont*"/>
-      <field cname="private_font_desc" type="PangoFontDescription*"/>
-      <field cname="rc_style" type="GtkRcStyle*"/>
-      <field cname="styles" type="GSList*"/>
-      <field cname="property_cache" type="GArray*"/>
-      <field cname="icon_factories" type="GSList*"/>
+      <field cname="fg" array_len="5" type="GdkColor" />
+      <field cname="bg" array_len="5" type="GdkColor" />
+      <field cname="light" array_len="5" type="GdkColor" />
+      <field cname="dark" array_len="5" type="GdkColor" />
+      <field cname="mid" array_len="5" type="GdkColor" />
+      <field cname="text" array_len="5" type="GdkColor" />
+      <field cname="base" array_len="5" type="GdkColor" />
+      <field cname="text_aa" array_len="5" type="GdkColor" />
+      <field cname="black" type="GdkColor" />
+      <field cname="white" type="GdkColor" />
+      <field cname="font_desc" type="PangoFontDescription*" />
+      <field cname="xthickness" type="gint" />
+      <field cname="ythickness" type="gint" />
+      <field cname="fg_gc" array_len="5" type="GdkGC*" />
+      <field cname="bg_gc" array_len="5" type="GdkGC*" />
+      <field cname="light_gc" array_len="5" type="GdkGC*" />
+      <field cname="dark_gc" array_len="5" type="GdkGC*" />
+      <field cname="mid_gc" array_len="5" type="GdkGC*" />
+      <field cname="text_gc" array_len="5" type="GdkGC*" />
+      <field cname="base_gc" array_len="5" type="GdkGC*" />
+      <field cname="text_aa_gc" array_len="5" type="GdkGC*" />
+      <field cname="black_gc" type="GdkGC*" />
+      <field cname="white_gc" type="GdkGC*" />
+      <field cname="bg_pixmap" array_len="5" type="GdkPixmap*" />
+      <field cname="attach_count" type="gint" />
+      <field cname="depth" type="gint" />
+      <field cname="colormap" type="GdkColormap*" />
+      <field cname="private_font" type="GdkFont*" />
+      <field cname="private_font_desc" type="PangoFontDescription*" />
+      <field cname="rc_style" type="GtkRcStyle*" />
+      <field cname="styles" type="GSList*" />
+      <field cname="property_cache" type="GArray*" />
+      <field cname="icon_factories" type="GSList*" />
       <method name="ApplyDefaultBackground" cname="gtk_style_apply_default_background">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="gboolean" name="set_bg"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="gboolean" name="set_bg" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Attach" cname="gtk_style_attach">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
+          <parameter type="GdkWindow*" name="window" />
         </parameters>
       </method>
       <method name="Copy" cname="gtk_style_copy">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
       </method>
       <method name="Detach" cname="gtk_style_detach">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_style_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="LookupIconSet" cname="gtk_style_lookup_icon_set">
-        <return-type type="GtkIconSet*"/>
+        <return-type type="GtkIconSet*" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="const-gchar*" name="stock_id" />
         </parameters>
       </method>
-      <constructor cname="gtk_style_new"/>
+      <constructor cname="gtk_style_new" />
       <method name="RenderIcon" cname="gtk_style_render_icon">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="const-GtkIconSource*" name="source"/>
-          <parameter type="GtkTextDirection" name="direction"/>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GtkIconSize" name="size"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
+          <parameter type="const-GtkIconSource*" name="source" />
+          <parameter type="GtkTextDirection" name="direction" />
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GtkIconSize" name="size" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
         </parameters>
       </method>
       <method name="SetBackground" cname="gtk_style_set_background">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
         </parameters>
       </method>
     </object>
     <object name="Table" cname="GtkTable" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="rows" type="GtkTableRowCol*"/>
-      <field cname="cols" type="GtkTableRowCol*"/>
-      <field cname="nrows" type="guint16"/>
-      <field cname="ncols" type="guint16"/>
-      <field cname="column_spacing" type="guint16"/>
-      <field cname="row_spacing" type="guint16"/>
-      <field cname="homogeneous" bits="1" type="guint"/>
-      <property name="NRows" cname="n_rows" type="guint" readable="true" writeable="true"/>
-      <property name="NColumns" cname="n_columns" type="guint" readable="true" writeable="true"/>
-      <property name="RowSpacing" cname="row_spacing" type="guint" readable="true" writeable="true"/>
-      <property name="ColumnSpacing" cname="column_spacing" type="guint" readable="true" writeable="true"/>
-      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true"/>
+      <field cname="children" type="GList*" />
+      <field cname="rows" type="GtkTableRowCol*" />
+      <field cname="cols" type="GtkTableRowCol*" />
+      <field cname="nrows" type="guint16" />
+      <field cname="ncols" type="guint16" />
+      <field cname="column_spacing" type="guint16" />
+      <field cname="row_spacing" type="guint16" />
+      <field cname="homogeneous" bits="1" type="guint" />
+      <property name="NRows" cname="n_rows" type="guint" readable="true" writeable="true" />
+      <property name="NColumns" cname="n_columns" type="guint" readable="true" writeable="true" />
+      <property name="RowSpacing" cname="row_spacing" type="guint" readable="true" writeable="true" />
+      <property name="ColumnSpacing" cname="column_spacing" type="guint" readable="true" writeable="true" />
+      <property name="Homogeneous" cname="homogeneous" type="gboolean" readable="true" writeable="true" />
       <method name="Attach" cname="gtk_table_attach">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="guint" name="left_attach"/>
-          <parameter type="guint" name="right_attach"/>
-          <parameter type="guint" name="top_attach"/>
-          <parameter type="guint" name="bottom_attach"/>
-          <parameter type="GtkAttachOptions" name="xoptions"/>
-          <parameter type="GtkAttachOptions" name="yoptions"/>
-          <parameter type="guint" name="xpadding"/>
-          <parameter type="guint" name="ypadding"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="guint" name="left_attach" />
+          <parameter type="guint" name="right_attach" />
+          <parameter type="guint" name="top_attach" />
+          <parameter type="guint" name="bottom_attach" />
+          <parameter type="GtkAttachOptions" name="xoptions" />
+          <parameter type="GtkAttachOptions" name="yoptions" />
+          <parameter type="guint" name="xpadding" />
+          <parameter type="guint" name="ypadding" />
         </parameters>
       </method>
       <method name="Attach" cname="gtk_table_attach_defaults">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="guint" name="left_attach"/>
-          <parameter type="guint" name="right_attach"/>
-          <parameter type="guint" name="top_attach"/>
-          <parameter type="guint" name="bottom_attach"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="guint" name="left_attach" />
+          <parameter type="guint" name="right_attach" />
+          <parameter type="guint" name="top_attach" />
+          <parameter type="guint" name="bottom_attach" />
         </parameters>
       </method>
       <method name="GetColSpacing" cname="gtk_table_get_col_spacing">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint" name="column"/>
+          <parameter type="guint" name="column" />
         </parameters>
       </method>
       <method name="GetDefaultColSpacing" cname="gtk_table_get_default_col_spacing">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetDefaultRowSpacing" cname="gtk_table_get_default_row_spacing">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetHomogeneous" cname="gtk_table_get_homogeneous">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetRowSpacing" cname="gtk_table_get_row_spacing">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint" name="row"/>
+          <parameter type="guint" name="row" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_table_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_table_new">
         <parameters>
-          <parameter type="guint" name="rows"/>
-          <parameter type="guint" name="columns"/>
-          <parameter type="gboolean" name="homogeneous"/>
+          <parameter type="guint" name="rows" />
+          <parameter type="guint" name="columns" />
+          <parameter type="gboolean" name="homogeneous" />
         </parameters>
       </constructor>
       <method name="Resize" cname="gtk_table_resize">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="rows"/>
-          <parameter type="guint" name="columns"/>
+          <parameter type="guint" name="rows" />
+          <parameter type="guint" name="columns" />
         </parameters>
       </method>
       <method name="SetColSpacing" cname="gtk_table_set_col_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="column"/>
-          <parameter type="guint" name="spacing"/>
+          <parameter type="guint" name="column" />
+          <parameter type="guint" name="spacing" />
         </parameters>
       </method>
       <method name="SetColSpacings" cname="gtk_table_set_col_spacings" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="spacing"/>
+          <parameter type="guint" name="spacing" />
         </parameters>
       </method>
       <method name="SetHomogeneous" cname="gtk_table_set_homogeneous">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="homogeneous"/>
+          <parameter type="gboolean" name="homogeneous" />
         </parameters>
       </method>
       <method name="SetRowSpacing" cname="gtk_table_set_row_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="row"/>
-          <parameter type="guint" name="spacing"/>
+          <parameter type="guint" name="row" />
+          <parameter type="guint" name="spacing" />
         </parameters>
       </method>
       <method name="SetRowSpacings" cname="gtk_table_set_row_spacings" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="spacing"/>
+          <parameter type="guint" name="spacing" />
         </parameters>
       </method>
     </object>
     <object name="TearoffMenuItem" cname="GtkTearoffMenuItem" parent="GtkMenuItem">
-      <field cname="torn_off" bits="1" type="guint"/>
+      <field cname="torn_off" bits="1" type="guint" />
       <method name="GetType" cname="gtk_tearoff_menu_item_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_tearoff_menu_item_new"/>
+      <constructor cname="gtk_tearoff_menu_item_new" />
     </object>
     <object name="TextBuffer" cname="GtkTextBuffer" parent="GObject">
-      <field cname="tag_table" type="GtkTextTagTable*"/>
-      <field cname="btree" type="GtkTextBTree*"/>
-      <field cname="clipboard_contents_buffers" type="GSList*"/>
-      <field cname="selection_clipboards" type="GSList*"/>
-      <field cname="log_attr_cache" type="GtkTextLogAttrCache*"/>
-      <field cname="user_action_count" type="guint"/>
-      <field cname="modified" bits="1" type="guint"/>
-      <property name="TagTable" cname="tag_table" type="GtkTextTagTable" readable="true" writeable="true" construct-only="true"/>
+      <field cname="tag_table" type="GtkTextTagTable*" />
+      <field cname="btree" type="GtkTextBTree*" />
+      <field cname="clipboard_contents_buffers" type="GSList*" />
+      <field cname="selection_clipboards" type="GSList*" />
+      <field cname="log_attr_cache" type="GtkTextLogAttrCache*" />
+      <field cname="user_action_count" type="guint" />
+      <field cname="modified" bits="1" type="guint" />
+      <property name="TagTable" cname="tag_table" type="GtkTextTagTable" readable="true" writeable="true" construct-only="true" />
       <signal name="InsertText" cname="insert_text" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextIter*" name="pos"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="length"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextIter*" name="pos" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="length" />
         </parameters>
       </signal>
       <signal name="PixbufInserted" cname="insert_pixbuf" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextIter*" name="pos"/>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextIter*" name="pos" />
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </signal>
       <signal name="ChildAnchorInserted" cname="insert_child_anchor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextIter*" name="pos"/>
-          <parameter type="GtkTextChildAnchor*" name="anchor"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextIter*" name="pos" />
+          <parameter type="GtkTextChildAnchor*" name="anchor" />
         </parameters>
       </signal>
       <signal name="DeleteRange" cname="delete_range" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextIter*" name="start"/>
-          <parameter type="GtkTextIter*" name="end"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextIter*" name="start" />
+          <parameter type="GtkTextIter*" name="end" />
         </parameters>
       </signal>
       <signal name="Changed" cname="changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
       <signal name="ModifiedChanged" cname="modified_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
       <signal name="MarkSet" cname="mark_set" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="const-GtkTextIter*" name="location"/>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="const-GtkTextIter*" name="location" />
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </signal>
       <signal name="MarkDeleted" cname="mark_deleted" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </signal>
       <signal name="TagApplied" cname="apply_tag" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start_char"/>
-          <parameter type="const-GtkTextIter*" name="end_char"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="const-GtkTextIter*" name="start_char" />
+          <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
       <signal name="TagRemoved" cname="remove_tag" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start_char"/>
-          <parameter type="const-GtkTextIter*" name="end_char"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="const-GtkTextIter*" name="start_char" />
+          <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
       <signal name="UserActionBegun" cname="begin_user_action" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
       <signal name="UserActionEnded" cname="end_user_action" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
       <method name="AddSelectionClipboard" cname="gtk_text_buffer_add_selection_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
+          <parameter type="GtkClipboard*" name="clipboard" />
         </parameters>
       </method>
       <method name="ApplyTag" cname="gtk_text_buffer_apply_tag">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="ApplyTag" cname="gtk_text_buffer_apply_tag_by_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="BeginUserAction" cname="gtk_text_buffer_begin_user_action">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="CopyClipboard" cname="gtk_text_buffer_copy_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
+          <parameter type="GtkClipboard*" name="clipboard" />
         </parameters>
       </method>
       <method name="CreateChildAnchor" cname="gtk_text_buffer_create_child_anchor">
-        <return-type type="GtkTextChildAnchor*"/>
+        <return-type type="GtkTextChildAnchor*" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="CreateMark" cname="gtk_text_buffer_create_mark">
-        <return-type type="GtkTextMark*"/>
+        <return-type type="GtkTextMark*" />
         <parameters>
-          <parameter type="const-gchar*" name="mark_name"/>
-          <parameter type="const-GtkTextIter*" name="where"/>
-          <parameter type="gboolean" name="left_gravity"/>
+          <parameter type="const-gchar*" name="mark_name" />
+          <parameter type="const-GtkTextIter*" name="where" />
+          <parameter type="gboolean" name="left_gravity" />
         </parameters>
       </method>
       <method name="CreateTag" cname="gtk_text_buffer_create_tag">
-        <return-type type="GtkTextTag*"/>
+        <return-type type="GtkTextTag*" />
         <parameters>
-          <parameter type="const-gchar*" name="tag_name"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="tag_name" />
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="CutClipboard" cname="gtk_text_buffer_cut_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="GtkClipboard*" name="clipboard" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="Delete" cname="gtk_text_buffer_delete">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="start"/>
-          <parameter type="GtkTextIter*" name="end"/>
+          <parameter type="GtkTextIter*" name="start" />
+          <parameter type="GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="DeleteInteractive" cname="gtk_text_buffer_delete_interactive">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="start_iter"/>
-          <parameter type="GtkTextIter*" name="end_iter"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="GtkTextIter*" name="start_iter" />
+          <parameter type="GtkTextIter*" name="end_iter" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="DeleteMark" cname="gtk_text_buffer_delete_mark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </method>
       <method name="DeleteMark" cname="gtk_text_buffer_delete_mark_by_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="DeleteSelection" cname="gtk_text_buffer_delete_selection">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="interactive"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="gboolean" name="interactive" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="EndUserAction" cname="gtk_text_buffer_end_user_action">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetBounds" cname="gtk_text_buffer_get_bounds">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="start" pass_as="out" />
+          <parameter type="GtkTextIter*" name="end" pass_as="out" />
         </parameters>
       </method>
       <method name="GetCharCount" cname="gtk_text_buffer_get_char_count">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetEndIter" cname="gtk_text_buffer_get_end_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="GetInsertMark" cname="gtk_text_buffer_get_insert">
-        <return-type type="GtkTextMark*"/>
+        <return-type type="GtkTextMark*" />
       </method>
       <method name="GetIterAtChildAnchor" cname="gtk_text_buffer_get_iter_at_child_anchor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTextChildAnchor*" name="anchor"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTextChildAnchor*" name="anchor" />
         </parameters>
       </method>
       <method name="GetIterAtLine" cname="gtk_text_buffer_get_iter_at_line">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="line_number"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="line_number" />
         </parameters>
       </method>
       <method name="GetIterAtLineIndex" cname="gtk_text_buffer_get_iter_at_line_index">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="line_number"/>
-          <parameter type="gint" name="byte_index"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="line_number" />
+          <parameter type="gint" name="byte_index" />
         </parameters>
       </method>
       <method name="GetIterAtLineOffset" cname="gtk_text_buffer_get_iter_at_line_offset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="line_number"/>
-          <parameter type="gint" name="char_offset"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="line_number" />
+          <parameter type="gint" name="char_offset" />
         </parameters>
       </method>
       <method name="GetIterAtMark" cname="gtk_text_buffer_get_iter_at_mark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </method>
       <method name="GetIterAtOffset" cname="gtk_text_buffer_get_iter_at_offset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="char_offset"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="char_offset" />
         </parameters>
       </method>
       <method name="GetLineCount" cname="gtk_text_buffer_get_line_count">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMark" cname="gtk_text_buffer_get_mark">
-        <return-type type="GtkTextMark*"/>
+        <return-type type="GtkTextMark*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="GetModified" cname="gtk_text_buffer_get_modified">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSelectionBound" cname="gtk_text_buffer_get_selection_bound">
-        <return-type type="GtkTextMark*"/>
+        <return-type type="GtkTextMark*" />
       </method>
       <method name="GetSelectionBounds" cname="gtk_text_buffer_get_selection_bounds">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="start" pass_as="out" />
+          <parameter type="GtkTextIter*" name="end" pass_as="out" />
         </parameters>
       </method>
       <method name="GetSlice" cname="gtk_text_buffer_get_slice">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-          <parameter type="gboolean" name="include_hidden_chars"/>
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
+          <parameter type="gboolean" name="include_hidden_chars" />
         </parameters>
       </method>
       <method name="GetStartIter" cname="gtk_text_buffer_get_start_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="GetTagTable" cname="gtk_text_buffer_get_tag_table">
-        <return-type type="GtkTextTagTable*"/>
+        <return-type type="GtkTextTagTable*" />
       </method>
       <method name="GetText" cname="gtk_text_buffer_get_text">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-          <parameter type="gboolean" name="include_hidden_chars"/>
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
+          <parameter type="gboolean" name="include_hidden_chars" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_text_buffer_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Insert" cname="gtk_text_buffer_insert">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
       <method name="InsertAtCursor" cname="gtk_text_buffer_insert_at_cursor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
       <method name="InsertChildAnchor" cname="gtk_text_buffer_insert_child_anchor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="GtkTextChildAnchor*" name="anchor"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="GtkTextChildAnchor*" name="anchor" />
         </parameters>
       </method>
       <method name="InsertInteractive" cname="gtk_text_buffer_insert_interactive">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="InsertInteractiveAtCursor" cname="gtk_text_buffer_insert_interactive_at_cursor">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="InsertPixbuf" cname="gtk_text_buffer_insert_pixbuf">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </method>
       <method name="InsertRange" cname="gtk_text_buffer_insert_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="InsertRangeInteractive" cname="gtk_text_buffer_insert_range_interactive">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="InsertWithTags" cname="gtk_text_buffer_insert_with_tags">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
-          <parameter type="GtkTextTag*" name="first_tag"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
+          <parameter type="GtkTextTag*" name="first_tag" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="InsertWithTagsByName" cname="gtk_text_buffer_insert_with_tags_by_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
-          <parameter type="const-gchar*" name="first_tag_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
+          <parameter type="const-gchar*" name="first_tag_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="MoveMark" cname="gtk_text_buffer_move_mark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
-          <parameter type="const-GtkTextIter*" name="where"/>
+          <parameter type="GtkTextMark*" name="mark" />
+          <parameter type="const-GtkTextIter*" name="where" />
         </parameters>
       </method>
       <method name="MoveMark" cname="gtk_text_buffer_move_mark_by_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkTextIter*" name="where"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-GtkTextIter*" name="where" />
         </parameters>
       </method>
       <constructor cname="gtk_text_buffer_new">
         <parameters>
-          <parameter type="GtkTextTagTable*" name="table" null_ok="1"/>
+          <parameter type="GtkTextTagTable*" name="table" null_ok="1" />
         </parameters>
       </constructor>
       <method name="PasteClipboard" cname="gtk_text_buffer_paste_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
-          <parameter type="GtkTextIter*" name="override_location"/>
-          <parameter type="gboolean" name="default_editable"/>
+          <parameter type="GtkClipboard*" name="clipboard" />
+          <parameter type="GtkTextIter*" name="override_location" />
+          <parameter type="gboolean" name="default_editable" />
         </parameters>
       </method>
       <method name="PlaceCursor" cname="gtk_text_buffer_place_cursor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="where"/>
+          <parameter type="const-GtkTextIter*" name="where" />
         </parameters>
       </method>
       <method name="RemoveAllTags" cname="gtk_text_buffer_remove_all_tags">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="RemoveSelectionClipboard" cname="gtk_text_buffer_remove_selection_clipboard">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
+          <parameter type="GtkClipboard*" name="clipboard" />
         </parameters>
       </method>
       <method name="RemoveTag" cname="gtk_text_buffer_remove_tag">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="RemoveTag" cname="gtk_text_buffer_remove_tag_by_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="SetModified" cname="gtk_text_buffer_set_modified">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_text_buffer_set_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="text" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
     </object>
     <object name="TextChildAnchor" cname="GtkTextChildAnchor" parent="GObject">
-      <field cname="segment" type="gpointer"/>
+      <field cname="segment" type="gpointer" />
       <method name="GetDeleted" cname="gtk_text_child_anchor_get_deleted">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_text_child_anchor_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetWidgets" cname="gtk_text_child_anchor_get_widgets">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
-      <constructor cname="gtk_text_child_anchor_new"/>
+      <constructor cname="gtk_text_child_anchor_new" />
     </object>
     <object name="TextMark" cname="GtkTextMark" parent="GObject">
-      <field cname="segment" type="gpointer"/>
+      <field cname="segment" type="gpointer" />
       <method name="GetBuffer" cname="gtk_text_mark_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
+        <return-type type="GtkTextBuffer*" />
       </method>
       <method name="GetDeleted" cname="gtk_text_mark_get_deleted">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetLeftGravity" cname="gtk_text_mark_get_left_gravity">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetName" cname="gtk_text_mark_get_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_text_mark_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisible" cname="gtk_text_mark_get_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="SetVisible" cname="gtk_text_mark_set_visible">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
     </object>
     <object name="TextTag" cname="GtkTextTag" parent="GObject">
-      <field cname="table" type="GtkTextTagTable*"/>
-      <field cname="name" type="char*"/>
-      <field cname="priority" type="int"/>
-      <field cname="values" type="GtkTextAttributes*"/>
-      <field cname="bg_color_set" bits="1" type="guint"/>
-      <field cname="bg_stipple_set" bits="1" type="guint"/>
-      <field cname="fg_color_set" bits="1" type="guint"/>
-      <field cname="scale_set" bits="1" type="guint"/>
-      <field cname="fg_stipple_set" bits="1" type="guint"/>
-      <field cname="justification_set" bits="1" type="guint"/>
-      <field cname="left_margin_set" bits="1" type="guint"/>
-      <field cname="indent_set" bits="1" type="guint"/>
-      <field cname="rise_set" bits="1" type="guint"/>
-      <field cname="strikethrough_set" bits="1" type="guint"/>
-      <field cname="right_margin_set" bits="1" type="guint"/>
-      <field cname="pixels_above_lines_set" bits="1" type="guint"/>
-      <field cname="pixels_below_lines_set" bits="1" type="guint"/>
-      <field cname="pixels_inside_wrap_set" bits="1" type="guint"/>
-      <field cname="tabs_set" bits="1" type="guint"/>
-      <field cname="underline_set" bits="1" type="guint"/>
-      <field cname="wrap_mode_set" bits="1" type="guint"/>
-      <field cname="bg_full_height_set" bits="1" type="guint"/>
-      <field cname="invisible_set" bits="1" type="guint"/>
-      <field cname="editable_set" bits="1" type="guint"/>
-      <field cname="language_set" bits="1" type="guint"/>
-      <field cname="pad1" bits="1" type="guint"/>
-      <field cname="pad2" bits="1" type="guint"/>
-      <field cname="pad3" bits="1" type="guint"/>
-      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" construct-only="true"/>
-      <property name="Background" cname="background" type="gchar*" writeable="true"/>
-      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="BackgroundFullHeight" cname="background_full_height" type="gboolean" readable="true" writeable="true"/>
-      <property name="BackgroundStipple" cname="background_stipple" type="GdkPixmap" readable="true" writeable="true"/>
-      <property name="Foreground" cname="foreground" type="gchar*" writeable="true"/>
-      <property name="ForegroundGdk" cname="foreground_gdk" type="GdkColor" readable="true" writeable="true"/>
-      <property name="ForegroundStipple" cname="foreground_stipple" type="GdkPixmap" readable="true" writeable="true"/>
-      <property name="Direction" cname="direction" type="GtkTextDirection" readable="true" writeable="true"/>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true"/>
-      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true"/>
-      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true"/>
-      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true"/>
-      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true"/>
-      <property name="Weight" cname="weight" type="PangoWeight" readable="true" writeable="true"/>
-      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true"/>
-      <property name="Size" cname="size" type="gint" readable="true" writeable="true"/>
-      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true"/>
-      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true"/>
-      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true"/>
-      <property name="Language" cname="language" type="gchar*" readable="true" writeable="true"/>
-      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true"/>
-      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true"/>
-      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true"/>
-      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true"/>
-      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true"/>
-      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true"/>
-      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true"/>
-      <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true"/>
-      <property name="Invisible" cname="invisible" type="gboolean" readable="true" writeable="true"/>
+      <field cname="table" type="GtkTextTagTable*" />
+      <field cname="name" type="char*" />
+      <field cname="priority" type="int" />
+      <field cname="values" type="GtkTextAttributes*" />
+      <field cname="bg_color_set" bits="1" type="guint" />
+      <field cname="bg_stipple_set" bits="1" type="guint" />
+      <field cname="fg_color_set" bits="1" type="guint" />
+      <field cname="scale_set" bits="1" type="guint" />
+      <field cname="fg_stipple_set" bits="1" type="guint" />
+      <field cname="justification_set" bits="1" type="guint" />
+      <field cname="left_margin_set" bits="1" type="guint" />
+      <field cname="indent_set" bits="1" type="guint" />
+      <field cname="rise_set" bits="1" type="guint" />
+      <field cname="strikethrough_set" bits="1" type="guint" />
+      <field cname="right_margin_set" bits="1" type="guint" />
+      <field cname="pixels_above_lines_set" bits="1" type="guint" />
+      <field cname="pixels_below_lines_set" bits="1" type="guint" />
+      <field cname="pixels_inside_wrap_set" bits="1" type="guint" />
+      <field cname="tabs_set" bits="1" type="guint" />
+      <field cname="underline_set" bits="1" type="guint" />
+      <field cname="wrap_mode_set" bits="1" type="guint" />
+      <field cname="bg_full_height_set" bits="1" type="guint" />
+      <field cname="invisible_set" bits="1" type="guint" />
+      <field cname="editable_set" bits="1" type="guint" />
+      <field cname="language_set" bits="1" type="guint" />
+      <field cname="pad1" bits="1" type="guint" />
+      <field cname="pad2" bits="1" type="guint" />
+      <field cname="pad3" bits="1" type="guint" />
+      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="Background" cname="background" type="gchar*" writeable="true" />
+      <property name="BackgroundGdk" cname="background_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="BackgroundFullHeight" cname="background_full_height" type="gboolean" readable="true" writeable="true" />
+      <property name="BackgroundStipple" cname="background_stipple" type="GdkPixmap" readable="true" writeable="true" />
+      <property name="Foreground" cname="foreground" type="gchar*" writeable="true" />
+      <property name="ForegroundGdk" cname="foreground_gdk" type="GdkColor" readable="true" writeable="true" />
+      <property name="ForegroundStipple" cname="foreground_stipple" type="GdkPixmap" readable="true" writeable="true" />
+      <property name="Direction" cname="direction" type="GtkTextDirection" readable="true" writeable="true" />
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="Font" cname="font" type="gchar*" readable="true" writeable="true" />
+      <property name="FontDesc" cname="font_desc" type="PangoFontDescription" readable="true" writeable="true" />
+      <property name="Family" cname="family" type="gchar*" readable="true" writeable="true" />
+      <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true" />
+      <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true" />
+      <property name="Weight" cname="weight" type="PangoWeight" readable="true" writeable="true" />
+      <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true" />
+      <property name="Size" cname="size" type="gint" readable="true" writeable="true" />
+      <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true" />
+      <property name="SizePoints" cname="size_points" type="gdouble" readable="true" writeable="true" />
+      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true" />
+      <property name="Language" cname="language" type="gchar*" readable="true" writeable="true" />
+      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true" />
+      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true" />
+      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true" />
+      <property name="Rise" cname="rise" type="gint" readable="true" writeable="true" />
+      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true" />
+      <property name="Strikethrough" cname="strikethrough" type="gboolean" readable="true" writeable="true" />
+      <property name="Underline" cname="underline" type="PangoUnderline" readable="true" writeable="true" />
+      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true" />
+      <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true" />
+      <property name="Invisible" cname="invisible" type="gboolean" readable="true" writeable="true" />
       <signal name="TextEvent" cname="event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="GObject*" name="event_object"/>
-          <parameter type="GdkEvent*" name="event"/>
-          <parameter type="const-GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="GObject*" name="event_object" />
+          <parameter type="GdkEvent*" name="event" />
+          <parameter type="const-GtkTextIter*" name="iter" />
         </parameters>
       </signal>
       <method name="ProcessEvent" cname="gtk_text_tag_event">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GObject*" name="event_object"/>
-          <parameter type="GdkEvent*" name="event"/>
-          <parameter type="const-GtkTextIter*" name="iter"/>
+          <parameter type="GObject*" name="event_object" />
+          <parameter type="GdkEvent*" name="event" />
+          <parameter type="const-GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="GetPriority" cname="gtk_text_tag_get_priority">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gtk_text_tag_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_text_tag_new">
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </constructor>
       <method name="SetPriority" cname="gtk_text_tag_set_priority">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="priority"/>
+          <parameter type="gint" name="priority" />
         </parameters>
       </method>
     </object>
     <object name="TextTagTable" cname="GtkTextTagTable" parent="GObject">
-      <field cname="hash" type="GHashTable*"/>
-      <field cname="anonymous" type="GSList*"/>
-      <field cname="anon_count" type="gint"/>
-      <field cname="buffers" type="GSList*"/>
+      <field cname="hash" type="GHashTable*" />
+      <field cname="anonymous" type="GSList*" />
+      <field cname="anon_count" type="gint" />
+      <field cname="buffers" type="GSList*" />
       <signal name="TagChanged" cname="tag_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTagTable*" name="table"/>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="gboolean" name="size_changed"/>
+          <parameter type="GtkTextTagTable*" name="table" />
+          <parameter type="GtkTextTag*" name="tag" />
+          <parameter type="gboolean" name="size_changed" />
         </parameters>
       </signal>
       <signal name="TagAdded" cname="tag_added" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTagTable*" name="table"/>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTagTable*" name="table" />
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </signal>
       <signal name="TagRemoved" cname="tag_removed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTagTable*" name="table"/>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTagTable*" name="table" />
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </signal>
       <method name="Add" cname="gtk_text_tag_table_add">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
       <method name="Foreach" cname="gtk_text_tag_table_foreach">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTagTableForeach" name="func"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkTextTagTableForeach" name="func" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="GetSize" cname="gtk_text_tag_table_get_size">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetType" cname="gtk_text_tag_table_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Lookup" cname="gtk_text_tag_table_lookup">
-        <return-type type="GtkTextTag*"/>
+        <return-type type="GtkTextTag*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
-      <constructor cname="gtk_text_tag_table_new"/>
+      <constructor cname="gtk_text_tag_table_new" />
       <method name="Remove" cname="gtk_text_tag_table_remove">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
     </object>
     <object name="TextView" cname="GtkTextView" parent="GtkContainer">
-      <field cname="layout" type="struct-_GtkTextLayout*"/>
-      <field cname="buffer" type="GtkTextBuffer*"/>
-      <field cname="selection_drag_handler" type="guint"/>
-      <field cname="scroll_timeout" type="guint"/>
-      <field cname="pixels_above_lines" type="gint"/>
-      <field cname="pixels_below_lines" type="gint"/>
-      <field cname="pixels_inside_wrap" type="gint"/>
-      <field cname="wrap_mode" type="GtkWrapMode"/>
-      <field cname="justify" type="GtkJustification"/>
-      <field cname="left_margin" type="gint"/>
-      <field cname="right_margin" type="gint"/>
-      <field cname="indent" type="gint"/>
-      <field cname="tabs" type="PangoTabArray*"/>
-      <field cname="editable" bits="1" type="guint"/>
-      <field cname="overwrite_mode" bits="1" type="guint"/>
-      <field cname="cursor_visible" bits="1" type="guint"/>
-      <field cname="need_im_reset" bits="1" type="guint"/>
-      <field cname="just_selected_element" bits="1" type="guint"/>
-      <field cname="reserved2" bits="1" type="guint"/>
-      <field cname="onscreen_validated" bits="1" type="guint"/>
-      <field cname="mouse_cursor_obscured" bits="1" type="guint"/>
-      <field cname="text_window" type="GtkTextWindow*"/>
-      <field cname="left_window" type="GtkTextWindow*"/>
-      <field cname="right_window" type="GtkTextWindow*"/>
-      <field cname="top_window" type="GtkTextWindow*"/>
-      <field cname="bottom_window" type="GtkTextWindow*"/>
-      <field cname="hadjustment" type="GtkAdjustment*"/>
-      <field cname="vadjustment" type="GtkAdjustment*"/>
-      <field cname="xoffset" type="gint"/>
-      <field cname="yoffset" type="gint"/>
-      <field cname="width" type="gint"/>
-      <field cname="height" type="gint"/>
-      <field cname="virtual_cursor_x" type="gint"/>
-      <field cname="virtual_cursor_y" type="gint"/>
-      <field cname="first_para_mark" type="GtkTextMark*"/>
-      <field cname="first_para_pixels" type="gint"/>
-      <field cname="dnd_mark" type="GtkTextMark*"/>
-      <field cname="blink_timeout" type="guint"/>
-      <field cname="first_validate_idle" type="guint"/>
-      <field cname="incremental_validate_idle" type="guint"/>
-      <field cname="im_context" type="GtkIMContext*"/>
-      <field cname="popup_menu" type="GtkWidget*"/>
-      <field cname="drag_start_x" type="gint"/>
-      <field cname="drag_start_y" type="gint"/>
-      <field cname="children" type="GSList*"/>
-      <field cname="pending_scroll" type="GtkTextPendingScroll*"/>
-      <field cname="pending_place_cursor_button" type="gint"/>
-      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true"/>
-      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true"/>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true"/>
-      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true"/>
-      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true"/>
-      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true"/>
-      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true"/>
-      <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true"/>
-      <property name="CursorVisible" cname="cursor_visible" type="gboolean" readable="true" writeable="true"/>
+      <field cname="layout" type="struct-_GtkTextLayout*" />
+      <field cname="buffer" type="GtkTextBuffer*" />
+      <field cname="selection_drag_handler" type="guint" />
+      <field cname="scroll_timeout" type="guint" />
+      <field cname="pixels_above_lines" type="gint" />
+      <field cname="pixels_below_lines" type="gint" />
+      <field cname="pixels_inside_wrap" type="gint" />
+      <field cname="wrap_mode" type="GtkWrapMode" />
+      <field cname="justify" type="GtkJustification" />
+      <field cname="left_margin" type="gint" />
+      <field cname="right_margin" type="gint" />
+      <field cname="indent" type="gint" />
+      <field cname="tabs" type="PangoTabArray*" />
+      <field cname="editable" bits="1" type="guint" />
+      <field cname="overwrite_mode" bits="1" type="guint" />
+      <field cname="cursor_visible" bits="1" type="guint" />
+      <field cname="need_im_reset" bits="1" type="guint" />
+      <field cname="just_selected_element" bits="1" type="guint" />
+      <field cname="reserved2" bits="1" type="guint" />
+      <field cname="onscreen_validated" bits="1" type="guint" />
+      <field cname="mouse_cursor_obscured" bits="1" type="guint" />
+      <field cname="text_window" type="GtkTextWindow*" />
+      <field cname="left_window" type="GtkTextWindow*" />
+      <field cname="right_window" type="GtkTextWindow*" />
+      <field cname="top_window" type="GtkTextWindow*" />
+      <field cname="bottom_window" type="GtkTextWindow*" />
+      <field cname="hadjustment" type="GtkAdjustment*" />
+      <field cname="vadjustment" type="GtkAdjustment*" />
+      <field cname="xoffset" type="gint" />
+      <field cname="yoffset" type="gint" />
+      <field cname="width" type="gint" />
+      <field cname="height" type="gint" />
+      <field cname="virtual_cursor_x" type="gint" />
+      <field cname="virtual_cursor_y" type="gint" />
+      <field cname="first_para_mark" type="GtkTextMark*" />
+      <field cname="first_para_pixels" type="gint" />
+      <field cname="dnd_mark" type="GtkTextMark*" />
+      <field cname="blink_timeout" type="guint" />
+      <field cname="first_validate_idle" type="guint" />
+      <field cname="incremental_validate_idle" type="guint" />
+      <field cname="im_context" type="GtkIMContext*" />
+      <field cname="popup_menu" type="GtkWidget*" />
+      <field cname="drag_start_x" type="gint" />
+      <field cname="drag_start_y" type="gint" />
+      <field cname="children" type="GSList*" />
+      <field cname="pending_scroll" type="GtkTextPendingScroll*" />
+      <field cname="pending_place_cursor_button" type="gint" />
+      <property name="PixelsAboveLines" cname="pixels_above_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsBelowLines" cname="pixels_below_lines" type="gint" readable="true" writeable="true" />
+      <property name="PixelsInsideWrap" cname="pixels_inside_wrap" type="gint" readable="true" writeable="true" />
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true" />
+      <property name="Justification" cname="justification" type="GtkJustification" readable="true" writeable="true" />
+      <property name="LeftMargin" cname="left_margin" type="gint" readable="true" writeable="true" />
+      <property name="RightMargin" cname="right_margin" type="gint" readable="true" writeable="true" />
+      <property name="Indent" cname="indent" type="gint" readable="true" writeable="true" />
+      <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true" />
+      <property name="CursorVisible" cname="cursor_visible" type="gboolean" readable="true" writeable="true" />
       <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="GtkMovementStep" name="step"/>
-          <parameter type="gint" name="count"/>
-          <parameter type="gboolean" name="extend_selection"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="GtkMovementStep" name="step" />
+          <parameter type="gint" name="count" />
+          <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
       <signal name="PageHorizontally" cname="page_horizontally" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="gint" name="count"/>
-          <parameter type="gboolean" name="extend_selection"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="gint" name="count" />
+          <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
       <signal name="SetAnchor" cname="set_anchor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
+          <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
       <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
       <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="GtkDeleteType" name="type"/>
-          <parameter type="gint" name="count"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="GtkDeleteType" name="type" />
+          <parameter type="gint" name="count" />
         </parameters>
       </signal>
       <signal name="CutClipboard" cname="cut_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
+          <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
       <signal name="CopyClipboard" cname="copy_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
+          <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
       <signal name="PasteClipboard" cname="paste_clipboard" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
+          <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
       <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
+          <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
       <signal name="MoveFocus" cname="move_focus" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
       <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="GtkAdjustment*" name="hadjustment" />
+          <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
       <signal name="PopulatePopup" cname="populate_popup" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextView*" name="text_view"/>
-          <parameter type="GtkMenu*" name="menu"/>
+          <parameter type="GtkTextView*" name="text_view" />
+          <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </signal>
       <signal name="SelectAll" cname="select_all" when="LAST">
-        <return-type type="GNone"/>
+        <return-type type="GNone" />
         <parameters>
-          <parameter name="p0" type="GBoolean"/>
+          <parameter name="p0" type="GBoolean" />
         </parameters>
       </signal>
       <method name="AddChildAtAnchor" cname="gtk_text_view_add_child_at_anchor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkTextChildAnchor*" name="anchor"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkTextChildAnchor*" name="anchor" />
         </parameters>
       </method>
       <method name="AddChildInWindow" cname="gtk_text_view_add_child_in_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkTextWindowType" name="which_window"/>
-          <parameter type="gint" name="xpos"/>
-          <parameter type="gint" name="ypos"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="GtkTextWindowType" name="which_window" />
+          <parameter type="gint" name="xpos" />
+          <parameter type="gint" name="ypos" />
         </parameters>
       </method>
       <method name="BackwardDisplayLine" cname="gtk_text_view_backward_display_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="BackwardDisplayLineStart" cname="gtk_text_view_backward_display_line_start">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="BufferToWindowCoords" cname="gtk_text_view_buffer_to_window_coords">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextWindowType" name="win"/>
-          <parameter type="gint" name="buffer_x"/>
-          <parameter type="gint" name="buffer_y"/>
-          <parameter type="gint*" name="window_x"/>
-          <parameter type="gint*" name="window_y"/>
+          <parameter type="GtkTextWindowType" name="win" />
+          <parameter type="gint" name="buffer_x" />
+          <parameter type="gint" name="buffer_y" />
+          <parameter type="gint*" name="window_x" />
+          <parameter type="gint*" name="window_y" />
         </parameters>
       </method>
       <method name="ForwardDisplayLine" cname="gtk_text_view_forward_display_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="ForwardDisplayLineEnd" cname="gtk_text_view_forward_display_line_end">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
+          <parameter type="GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="GetBorderWindowSize" cname="gtk_text_view_get_border_window_size">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTextWindowType" name="type"/>
+          <parameter type="GtkTextWindowType" name="type" />
         </parameters>
       </method>
       <method name="GetBuffer" cname="gtk_text_view_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
+        <return-type type="GtkTextBuffer*" />
       </method>
       <method name="GetCursorVisible" cname="gtk_text_view_get_cursor_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetDefaultAttributes" cname="gtk_text_view_get_default_attributes">
-        <return-type type="GtkTextAttributes*"/>
+        <return-type type="GtkTextAttributes*" />
       </method>
       <method name="GetEditable" cname="gtk_text_view_get_editable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetIndent" cname="gtk_text_view_get_indent">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetIterAtLocation" cname="gtk_text_view_get_iter_at_location">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <method name="GetIterLocation" cname="gtk_text_view_get_iter_location">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
-          <parameter type="GdkRectangle*" name="location"/>
+          <parameter type="const-GtkTextIter*" name="iter" />
+          <parameter type="GdkRectangle*" name="location" />
         </parameters>
       </method>
       <method name="GetJustification" cname="gtk_text_view_get_justification">
-        <return-type type="GtkJustification"/>
+        <return-type type="GtkJustification" />
       </method>
       <method name="GetLeftMargin" cname="gtk_text_view_get_left_margin">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetLineAtY" cname="gtk_text_view_get_line_at_y">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="target_iter" pass_as="out"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint*" name="line_top"/>
+          <parameter type="GtkTextIter*" name="target_iter" pass_as="out" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint*" name="line_top" />
         </parameters>
       </method>
       <method name="GetLineYrange" cname="gtk_text_view_get_line_yrange">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
-          <parameter type="gint*" name="y"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="const-GtkTextIter*" name="iter" />
+          <parameter type="gint*" name="y" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="GetPixelsAboveLines" cname="gtk_text_view_get_pixels_above_lines">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPixelsBelowLines" cname="gtk_text_view_get_pixels_below_lines">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPixelsInsideWrap" cname="gtk_text_view_get_pixels_inside_wrap">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetRightMargin" cname="gtk_text_view_get_right_margin">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetTabs" cname="gtk_text_view_get_tabs">
-        <return-type type="PangoTabArray*"/>
+        <return-type type="PangoTabArray*" />
       </method>
       <method name="GetType" cname="gtk_text_view_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisibleRect" cname="gtk_text_view_get_visible_rect">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkRectangle*" name="visible_rect"/>
+          <parameter type="GdkRectangle*" name="visible_rect" />
         </parameters>
       </method>
       <method name="GetWindow" cname="gtk_text_view_get_window">
-        <return-type type="GdkWindow*"/>
+        <return-type type="GdkWindow*" />
         <parameters>
-          <parameter type="GtkTextWindowType" name="win"/>
+          <parameter type="GtkTextWindowType" name="win" />
         </parameters>
       </method>
       <method name="GetWindowType" cname="gtk_text_view_get_window_type">
-        <return-type type="GtkTextWindowType"/>
+        <return-type type="GtkTextWindowType" />
         <parameters>
-          <parameter type="GdkWindow*" name="window"/>
+          <parameter type="GdkWindow*" name="window" />
         </parameters>
       </method>
       <method name="GetWrapMode" cname="gtk_text_view_get_wrap_mode">
-        <return-type type="GtkWrapMode"/>
+        <return-type type="GtkWrapMode" />
       </method>
       <method name="MoveChild" cname="gtk_text_view_move_child">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="xpos"/>
-          <parameter type="gint" name="ypos"/>
+          <parameter type="GtkWidget*" name="child" />
+          <parameter type="gint" name="xpos" />
+          <parameter type="gint" name="ypos" />
         </parameters>
       </method>
       <method name="MoveMarkOnscreen" cname="gtk_text_view_move_mark_onscreen">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </method>
       <method name="MoveVisually" cname="gtk_text_view_move_visually">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="gint" name="count"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
-      <constructor cname="gtk_text_view_new"/>
+      <constructor cname="gtk_text_view_new" />
       <constructor cname="gtk_text_view_new_with_buffer">
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </constructor>
       <method name="PlaceCursorOnscreen" cname="gtk_text_view_place_cursor_onscreen">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ScrollMarkOnscreen" cname="gtk_text_view_scroll_mark_onscreen">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
+          <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </method>
       <method name="ScrollToIter" cname="gtk_text_view_scroll_to_iter">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-          <parameter type="gdouble" name="within_margin"/>
-          <parameter type="gboolean" name="use_align"/>
-          <parameter type="gdouble" name="xalign"/>
-          <parameter type="gdouble" name="yalign"/>
+          <parameter type="GtkTextIter*" name="iter" />
+          <parameter type="gdouble" name="within_margin" />
+          <parameter type="gboolean" name="use_align" />
+          <parameter type="gdouble" name="xalign" />
+          <parameter type="gdouble" name="yalign" />
         </parameters>
       </method>
       <method name="ScrollToMark" cname="gtk_text_view_scroll_to_mark">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
-          <parameter type="gdouble" name="within_margin"/>
-          <parameter type="gboolean" name="use_align"/>
-          <parameter type="gdouble" name="xalign"/>
-          <parameter type="gdouble" name="yalign"/>
+          <parameter type="GtkTextMark*" name="mark" />
+          <parameter type="gdouble" name="within_margin" />
+          <parameter type="gboolean" name="use_align" />
+          <parameter type="gdouble" name="xalign" />
+          <parameter type="gdouble" name="yalign" />
         </parameters>
       </method>
       <method name="SetBorderWindowSize" cname="gtk_text_view_set_border_window_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextWindowType" name="type"/>
-          <parameter type="gint" name="size"/>
+          <parameter type="GtkTextWindowType" name="type" />
+          <parameter type="gint" name="size" />
         </parameters>
       </method>
       <method name="SetBuffer" cname="gtk_text_view_set_buffer">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
+          <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </method>
       <method name="SetCursorVisible" cname="gtk_text_view_set_cursor_visible">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetEditable" cname="gtk_text_view_set_editable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetIndent" cname="gtk_text_view_set_indent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="indent"/>
+          <parameter type="gint" name="indent" />
         </parameters>
       </method>
       <method name="SetJustification" cname="gtk_text_view_set_justification">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkJustification" name="justification"/>
+          <parameter type="GtkJustification" name="justification" />
         </parameters>
       </method>
       <method name="SetLeftMargin" cname="gtk_text_view_set_left_margin">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="left_margin"/>
+          <parameter type="gint" name="left_margin" />
         </parameters>
       </method>
       <method name="SetPixelsAboveLines" cname="gtk_text_view_set_pixels_above_lines">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="pixels_above_lines"/>
+          <parameter type="gint" name="pixels_above_lines" />
         </parameters>
       </method>
       <method name="SetPixelsBelowLines" cname="gtk_text_view_set_pixels_below_lines">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="pixels_below_lines"/>
+          <parameter type="gint" name="pixels_below_lines" />
         </parameters>
       </method>
       <method name="SetPixelsInsideWrap" cname="gtk_text_view_set_pixels_inside_wrap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="pixels_inside_wrap"/>
+          <parameter type="gint" name="pixels_inside_wrap" />
         </parameters>
       </method>
       <method name="SetRightMargin" cname="gtk_text_view_set_right_margin">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="right_margin"/>
+          <parameter type="gint" name="right_margin" />
         </parameters>
       </method>
       <method name="SetTabs" cname="gtk_text_view_set_tabs">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="PangoTabArray*" name="tabs"/>
+          <parameter type="PangoTabArray*" name="tabs" />
         </parameters>
       </method>
       <method name="SetWrapMode" cname="gtk_text_view_set_wrap_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWrapMode" name="wrap_mode"/>
+          <parameter type="GtkWrapMode" name="wrap_mode" />
         </parameters>
       </method>
       <method name="StartsDisplayLine" cname="gtk_text_view_starts_display_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
+          <parameter type="const-GtkTextIter*" name="iter" />
         </parameters>
       </method>
       <method name="WindowToBufferCoords" cname="gtk_text_view_window_to_buffer_coords">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextWindowType" name="win"/>
-          <parameter type="gint" name="window_x"/>
-          <parameter type="gint" name="window_y"/>
-          <parameter type="gint*" name="buffer_x"/>
-          <parameter type="gint*" name="buffer_y"/>
+          <parameter type="GtkTextWindowType" name="win" />
+          <parameter type="gint" name="window_x" />
+          <parameter type="gint" name="window_y" />
+          <parameter type="gint*" name="buffer_x" />
+          <parameter type="gint*" name="buffer_y" />
         </parameters>
       </method>
     </object>
     <object name="ThemeEngine" cname="GtkThemeEngine" parent="GTypeModule">
       <method name="CreateRcStyle" cname="gtk_theme_engine_create_rc_style">
-        <return-type type="GtkRcStyle*"/>
+        <return-type type="GtkRcStyle*" />
       </method>
       <method name="Get" cname="gtk_theme_engine_get" shared="true">
-        <return-type type="GtkThemeEngine*"/>
+        <return-type type="GtkThemeEngine*" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_theme_engine_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </object>
     <object name="ToggleButton" cname="GtkToggleButton" parent="GtkButton">
-      <field cname="active" bits="1" type="guint"/>
-      <field cname="draw_indicator" bits="1" type="guint"/>
-      <field cname="inconsistent" bits="1" type="guint"/>
-      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true"/>
-      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true"/>
-      <property name="DrawIndicator" cname="draw_indicator" type="gboolean" readable="true" writeable="true"/>
+      <field cname="active" bits="1" type="guint" />
+      <field cname="draw_indicator" bits="1" type="guint" />
+      <field cname="inconsistent" bits="1" type="guint" />
+      <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
+      <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true" />
+      <property name="DrawIndicator" cname="draw_indicator" type="gboolean" readable="true" writeable="true" />
       <signal name="Toggled" cname="toggled" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToggleButton*" name="toggle_button"/>
+          <parameter type="GtkToggleButton*" name="toggle_button" />
         </parameters>
       </signal>
       <method name="GetActive" cname="gtk_toggle_button_get_active">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetInconsistent" cname="gtk_toggle_button_get_inconsistent">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetMode" cname="gtk_toggle_button_get_mode">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_toggle_button_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_toggle_button_new"/>
+      <constructor cname="gtk_toggle_button_new" />
       <constructor cname="gtk_toggle_button_new_with_label">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <constructor cname="gtk_toggle_button_new_with_mnemonic" preferred="1">
         <parameters>
-          <parameter type="const-gchar*" name="label"/>
+          <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
       <method name="SetActive" cname="gtk_toggle_button_set_active">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="is_active"/>
+          <parameter type="gboolean" name="is_active" />
         </parameters>
       </method>
       <method name="SetInconsistent" cname="gtk_toggle_button_set_inconsistent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetMode" cname="gtk_toggle_button_set_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="draw_indicator"/>
+          <parameter type="gboolean" name="draw_indicator" />
         </parameters>
       </method>
       <method name="Toggle" cname="gtk_toggle_button_toggled">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Toolbar" cname="GtkToolbar" parent="GtkContainer">
-      <field cname="num_children" type="gint"/>
-      <field cname="children" type="GList*"/>
-      <field cname="orientation" type="GtkOrientation"/>
-      <field cname="style" type="GtkToolbarStyle"/>
-      <field cname="icon_size" type="GtkIconSize"/>
-      <field cname="tooltips" type="GtkTooltips*"/>
-      <field cname="button_maxw" type="gint"/>
-      <field cname="button_maxh" type="gint"/>
-      <field cname="style_set_connection" type="guint"/>
-      <field cname="icon_size_connection" type="guint"/>
-      <field cname="style_set" bits="1" type="guint"/>
-      <field cname="icon_size_set" bits="1" type="guint"/>
+      <field cname="num_children" type="gint" />
+      <field cname="children" type="GList*" />
+      <field cname="orientation" type="GtkOrientation" />
+      <field cname="style" type="GtkToolbarStyle" />
+      <field cname="icon_size" type="GtkIconSize" />
+      <field cname="tooltips" type="GtkTooltips*" />
+      <field cname="button_maxw" type="gint" />
+      <field cname="button_maxh" type="gint" />
+      <field cname="style_set_connection" type="guint" />
+      <field cname="icon_size_connection" type="guint" />
+      <field cname="style_set" bits="1" type="guint" />
+      <field cname="icon_size_set" bits="1" type="guint" />
       <signal name="OrientationChanged" cname="orientation_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="GtkOrientation" name="orientation"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="GtkOrientation" name="orientation" />
         </parameters>
       </signal>
       <signal name="StyleChanged" cname="style_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbar*" name="toolbar"/>
-          <parameter type="GtkToolbarStyle" name="style"/>
+          <parameter type="GtkToolbar*" name="toolbar" />
+          <parameter type="GtkToolbarStyle" name="style" />
         </parameters>
       </signal>
-      <property name="Orientation" cname="orientation" type="GtkOrientation" readable="true" writeable="true"/>
-      <property name="ToolbarStyle" cname="toolbar_style" type="GtkToolbarStyle" readable="true" writeable="true"/>
+      <property name="Orientation" cname="orientation" type="GtkOrientation" readable="true" writeable="true" />
+      <property name="ToolbarStyle" cname="toolbar_style" type="GtkToolbarStyle" readable="true" writeable="true" />
       <method name="AppendElement" cname="gtk_toolbar_append_element">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkToolbarChildType" name="type"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkToolbarChildType" name="type" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="AppendItem" cname="gtk_toolbar_append_item">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data" null_ok="1"/>
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" null_ok="1" />
         </parameters>
       </method>
       <method name="AppendSpace" cname="gtk_toolbar_append_space">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="AppendWidget" cname="gtk_toolbar_append_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
         </parameters>
       </method>
       <method name="GetIconSize" cname="gtk_toolbar_get_icon_size">
-        <return-type type="GtkIconSize"/>
+        <return-type type="GtkIconSize" />
       </method>
       <method name="GetOrientation" cname="gtk_toolbar_get_orientation">
-        <return-type type="GtkOrientation"/>
+        <return-type type="GtkOrientation" />
       </method>
       <method name="GetStyle" cname="gtk_toolbar_get_style">
-        <return-type type="GtkToolbarStyle"/>
+        <return-type type="GtkToolbarStyle" />
       </method>
       <method name="GetTooltips" cname="gtk_toolbar_get_tooltips">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_toolbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="InsertElement" cname="gtk_toolbar_insert_element">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkToolbarChildType" name="type"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkToolbarChildType" name="type" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertItem" cname="gtk_toolbar_insert_item">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertSpace" cname="gtk_toolbar_insert_space">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="position"/>
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertStock" cname="gtk_toolbar_insert_stock">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertWidget" cname="gtk_toolbar_insert_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
-      <constructor cname="gtk_toolbar_new"/>
+      <constructor cname="gtk_toolbar_new" />
       <method name="PrependElement" cname="gtk_toolbar_prepend_element">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkToolbarChildType" name="type"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkToolbarChildType" name="type" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="PrependItem" cname="gtk_toolbar_prepend_item">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="const-char*" name="text" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
+          <parameter type="GtkWidget*" name="icon" />
+          <parameter type="GtkSignalFunc" name="callback" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="PrependSpace" cname="gtk_toolbar_prepend_space">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PrependWidget" cname="gtk_toolbar_prepend_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="tooltip_text" />
+          <parameter type="const-char*" name="tooltip_private_text" />
         </parameters>
       </method>
       <method name="RemoveSpace" cname="gtk_toolbar_remove_space">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="position"/>
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="SetIconSize" cname="gtk_toolbar_set_icon_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSize" name="icon_size"/>
+          <parameter type="GtkIconSize" name="icon_size" />
         </parameters>
       </method>
       <method name="SetOrientation" cname="gtk_toolbar_set_orientation">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkOrientation" name="orientation"/>
+          <parameter type="GtkOrientation" name="orientation" />
         </parameters>
       </method>
       <method name="SetStyle" cname="gtk_toolbar_set_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkToolbarStyle" name="style"/>
+          <parameter type="GtkToolbarStyle" name="style" />
         </parameters>
       </method>
       <method name="SetTooltips" cname="gtk_toolbar_set_tooltips">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="enable"/>
+          <parameter type="gboolean" name="enable" />
         </parameters>
       </method>
       <method name="UnsetIconSize" cname="gtk_toolbar_unset_icon_size">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UnsetStyle" cname="gtk_toolbar_unset_style">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Tooltips" cname="GtkTooltips" parent="GtkObject">
-      <field cname="tip_window" type="GtkWidget*"/>
-      <field cname="tip_label" type="GtkWidget*"/>
-      <field cname="active_tips_data" type="GtkTooltipsData*"/>
-      <field cname="tips_data_list" type="GList*"/>
-      <field cname="delay" bits="30" type="guint"/>
-      <field cname="enabled" bits="1" type="guint"/>
-      <field cname="have_grab" bits="1" type="guint"/>
-      <field cname="use_sticky_delay" bits="1" type="guint"/>
-      <field cname="timer_tag" type="gint"/>
-      <field cname="last_popdown" type="GTimeVal"/>
+      <field cname="tip_window" type="GtkWidget*" />
+      <field cname="tip_label" type="GtkWidget*" />
+      <field cname="active_tips_data" type="GtkTooltipsData*" />
+      <field cname="tips_data_list" type="GList*" />
+      <field cname="delay" bits="30" type="guint" />
+      <field cname="enabled" bits="1" type="guint" />
+      <field cname="have_grab" bits="1" type="guint" />
+      <field cname="use_sticky_delay" bits="1" type="guint" />
+      <field cname="timer_tag" type="gint" />
+      <field cname="last_popdown" type="GTimeVal" />
       <method name="Disable" cname="gtk_tooltips_disable">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Enable" cname="gtk_tooltips_enable">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ForceWindow" cname="gtk_tooltips_force_window">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_tooltips_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_tooltips_new"/>
+      <constructor cname="gtk_tooltips_new" />
       <method name="SetTip" cname="gtk_tooltips_set_tip">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="tip_text"/>
-          <parameter type="const-gchar*" name="tip_private"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="tip_text" />
+          <parameter type="const-gchar*" name="tip_private" />
         </parameters>
       </method>
     </object>
     <object name="TreeModelSort" cname="GtkTreeModelSort" parent="GObject">
-      <field cname="root" type="gpointer"/>
-      <field cname="stamp" type="gint"/>
-      <field cname="child_flags" type="guint"/>
-      <field cname="child_model" type="GtkTreeModel*"/>
-      <field cname="zero_ref_count" type="gint"/>
-      <field cname="sort_list" type="GList*"/>
-      <field cname="sort_column_id" type="gint"/>
-      <field cname="order" type="GtkSortType"/>
-      <field cname="default_sort_func" type="GtkTreeIterCompareFunc"/>
-      <field cname="default_sort_data" type="gpointer"/>
-      <field cname="default_sort_destroy" type="GtkDestroyNotify"/>
-      <field cname="changed_id" type="guint"/>
-      <field cname="inserted_id" type="guint"/>
-      <field cname="has_child_toggled_id" type="guint"/>
-      <field cname="deleted_id" type="guint"/>
-      <field cname="reordered_id" type="guint"/>
-      <property name="Model" cname="model" type="GtkTreeModel" readable="true" writeable="true" construct-only="true"/>
+      <field cname="root" type="gpointer" />
+      <field cname="stamp" type="gint" />
+      <field cname="child_flags" type="guint" />
+      <field cname="child_model" type="GtkTreeModel*" />
+      <field cname="zero_ref_count" type="gint" />
+      <field cname="sort_list" type="GList*" />
+      <field cname="sort_column_id" type="gint" />
+      <field cname="order" type="GtkSortType" />
+      <field cname="default_sort_func" type="GtkTreeIterCompareFunc" />
+      <field cname="default_sort_data" type="gpointer" />
+      <field cname="default_sort_destroy" type="GtkDestroyNotify" />
+      <field cname="changed_id" type="guint" />
+      <field cname="inserted_id" type="guint" />
+      <field cname="has_child_toggled_id" type="guint" />
+      <field cname="deleted_id" type="guint" />
+      <field cname="reordered_id" type="guint" />
+      <property name="Model" cname="model" type="GtkTreeModel" readable="true" writeable="true" construct-only="true" />
       <implements>
-        <interface cname="GtkTreeModel"/>
-        <interface cname="GtkTreeSortable"/>
+        <interface cname="GtkTreeModel" />
+        <interface cname="GtkTreeSortable" />
       </implements>
       <method name="ClearCache" cname="gtk_tree_model_sort_clear_cache">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ConvertChildIterToIter" cname="gtk_tree_model_sort_convert_child_iter_to_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="sort_iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="child_iter"/>
+          <parameter type="GtkTreeIter*" name="sort_iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="child_iter" />
         </parameters>
       </method>
       <method name="ConvertChildPathToPath" cname="gtk_tree_model_sort_convert_child_path_to_path">
-        <return-type type="GtkTreePath*"/>
+        <return-type type="GtkTreePath*" />
         <parameters>
-          <parameter type="GtkTreePath*" name="child_path"/>
+          <parameter type="GtkTreePath*" name="child_path" />
         </parameters>
       </method>
       <method name="ConvertIterToChildIter" cname="gtk_tree_model_sort_convert_iter_to_child_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="child_iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="sorted_iter"/>
+          <parameter type="GtkTreeIter*" name="child_iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="sorted_iter" />
         </parameters>
       </method>
       <method name="ConvertPathToChildPath" cname="gtk_tree_model_sort_convert_path_to_child_path">
-        <return-type type="GtkTreePath*"/>
+        <return-type type="GtkTreePath*" />
         <parameters>
-          <parameter type="GtkTreePath*" name="sorted_path"/>
+          <parameter type="GtkTreePath*" name="sorted_path" />
         </parameters>
       </method>
       <method name="GetModel" cname="gtk_tree_model_sort_get_model">
-        <return-type type="GtkTreeModel*"/>
+        <return-type type="GtkTreeModel*" />
       </method>
       <method name="GetType" cname="gtk_tree_model_sort_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="IterIsValid" cname="gtk_tree_model_sort_iter_is_valid">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <constructor cname="gtk_tree_model_sort_new_with_model">
         <parameters>
-          <parameter type="GtkTreeModel*" name="child_model"/>
+          <parameter type="GtkTreeModel*" name="child_model" />
         </parameters>
       </constructor>
       <method name="ResetDefaultSortFunc" cname="gtk_tree_model_sort_reset_default_sort_func">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="TreeSelection" cname="GtkTreeSelection" parent="GObject">
-      <field cname="tree_view" type="GtkTreeView*"/>
-      <field cname="type" type="GtkSelectionMode"/>
-      <field cname="user_func" type="GtkTreeSelectionFunc"/>
-      <field cname="user_data" type="gpointer"/>
-      <field cname="destroy" type="GtkDestroyNotify"/>
+      <field cname="tree_view" type="GtkTreeView*" />
+      <field cname="type" type="GtkSelectionMode" />
+      <field cname="user_func" type="GtkTreeSelectionFunc" />
+      <field cname="user_data" type="gpointer" />
+      <field cname="destroy" type="GtkDestroyNotify" />
       <signal name="Changed" cname="changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeSelection*" name="selection"/>
+          <parameter type="GtkTreeSelection*" name="selection" />
         </parameters>
       </signal>
       <method name="CountSelectedRows" cname="gtk_tree_selection_count_selected_rows">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMode" cname="gtk_tree_selection_get_mode">
-        <return-type type="GtkSelectionMode"/>
+        <return-type type="GtkSelectionMode" />
       </method>
       <method name="GetSelected" cname="gtk_tree_selection_get_selected" hidden="1">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeModel**" name="model"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeModel**" name="model" />
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="GetSelectedRows" cname="gtk_tree_selection_get_selected_rows">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
         <parameters>
-          <parameter type="GtkTreeModel**" name="model"/>
+          <parameter type="GtkTreeModel**" name="model" />
         </parameters>
       </method>
       <method name="GetTreeView" cname="gtk_tree_selection_get_tree_view">
-        <return-type type="GtkTreeView*"/>
+        <return-type type="GtkTreeView*" />
       </method>
       <method name="GetType" cname="gtk_tree_selection_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetUserData" cname="gtk_tree_selection_get_user_data">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
       </method>
       <method name="IterIsSelected" cname="gtk_tree_selection_iter_is_selected">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="PathIsSelected" cname="gtk_tree_selection_path_is_selected">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="SelectAll" cname="gtk_tree_selection_select_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectIter" cname="gtk_tree_selection_select_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="SelectPath" cname="gtk_tree_selection_select_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="SelectRange" cname="gtk_tree_selection_select_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="start_path"/>
-          <parameter type="GtkTreePath*" name="end_path"/>
+          <parameter type="GtkTreePath*" name="start_path" />
+          <parameter type="GtkTreePath*" name="end_path" />
         </parameters>
       </method>
       <method name="SelectedForeach" cname="gtk_tree_selection_selected_foreach">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeSelectionForeachFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkTreeSelectionForeachFunc" name="func" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="SetMode" cname="gtk_tree_selection_set_mode">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSelectionMode" name="type"/>
+          <parameter type="GtkSelectionMode" name="type" />
         </parameters>
       </method>
       <method name="SetSelectFunction" cname="gtk_tree_selection_set_select_function">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeSelectionFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GtkTreeSelectionFunc" name="func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="UnselectAll" cname="gtk_tree_selection_unselect_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UnselectIter" cname="gtk_tree_selection_unselect_iter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="UnselectPath" cname="gtk_tree_selection_unselect_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="UnselectRange" cname="gtk_tree_selection_unselect_range">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="start_path"/>
-          <parameter type="GtkTreePath*" name="end_path"/>
+          <parameter type="GtkTreePath*" name="start_path" />
+          <parameter type="GtkTreePath*" name="end_path" />
         </parameters>
       </method>
     </object>
     <object name="TreeStore" cname="GtkTreeStore" parent="GObject">
-      <field cname="stamp" type="gint"/>
-      <field cname="root" type="gpointer"/>
-      <field cname="last" type="gpointer"/>
-      <field cname="n_columns" type="gint"/>
-      <field cname="sort_column_id" type="gint"/>
-      <field cname="sort_list" type="GList*"/>
-      <field cname="order" type="GtkSortType"/>
-      <field cname="column_headers" type="GType*"/>
-      <field cname="default_sort_func" type="GtkTreeIterCompareFunc"/>
-      <field cname="default_sort_data" type="gpointer"/>
-      <field cname="default_sort_destroy" type="GtkDestroyNotify"/>
-      <field cname="columns_dirty" bits="1" type="guint"/>
+      <field cname="stamp" type="gint" />
+      <field cname="root" type="gpointer" />
+      <field cname="last" type="gpointer" />
+      <field cname="n_columns" type="gint" />
+      <field cname="sort_column_id" type="gint" />
+      <field cname="sort_list" type="GList*" />
+      <field cname="order" type="GtkSortType" />
+      <field cname="column_headers" type="GType*" />
+      <field cname="default_sort_func" type="GtkTreeIterCompareFunc" />
+      <field cname="default_sort_data" type="gpointer" />
+      <field cname="default_sort_destroy" type="GtkDestroyNotify" />
+      <field cname="columns_dirty" bits="1" type="guint" />
       <implements>
-        <interface cname="GtkTreeModel"/>
-        <interface cname="GtkTreeDragSource"/>
-        <interface cname="GtkTreeDragDest"/>
-        <interface cname="GtkTreeSortable"/>
+        <interface cname="GtkTreeModel" />
+        <interface cname="GtkTreeDragSource" />
+        <interface cname="GtkTreeDragDest" />
+        <interface cname="GtkTreeSortable" />
       </implements>
       <method name="Append" cname="gtk_tree_store_append">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
         </parameters>
       </method>
       <method name="Clear" cname="gtk_tree_store_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_tree_store_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Insert" cname="gtk_tree_store_insert">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertAfter" cname="gtk_tree_store_insert_after">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
+          <parameter type="GtkTreeIter*" name="sibling" />
         </parameters>
       </method>
       <method name="InsertBefore" cname="gtk_tree_store_insert_before">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
+          <parameter type="GtkTreeIter*" name="sibling" />
         </parameters>
       </method>
       <method name="IsAncestor" cname="gtk_tree_store_is_ancestor">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="descendant"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreeIter*" name="descendant" />
         </parameters>
       </method>
       <method name="IterDepth" cname="gtk_tree_store_iter_depth">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="IterIsValid" cname="gtk_tree_store_iter_is_valid">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </method>
       <method name="MoveAfter" cname="gtk_tree_store_move_after">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreeIter*" name="position" />
         </parameters>
       </method>
       <method name="MoveBefore" cname="gtk_tree_store_move_before">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="position"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreeIter*" name="position" />
         </parameters>
       </method>
       <constructor cname="gtk_tree_store_new">
         <parameters>
-          <parameter type="gint" name="n_columns"/>
-          <parameter ellipsis="true"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <constructor cname="gtk_tree_store_newv">
         <parameters va_type="length_param">
-          <parameter type="gint" name="n_columns"/>
-          <parameter type="GType*" name="types"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter type="GType*" name="types" />
         </parameters>
       </constructor>
       <method name="Prepend" cname="gtk_tree_store_prepend">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
+          <parameter type="GtkTreeIter*" name="parent" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_tree_store_remove">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTreeIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
       <method name="Reorder" cname="gtk_tree_store_reorder">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="gint*" name="new_order"/>
+          <parameter type="GtkTreeIter*" name="parent" />
+          <parameter type="gint*" name="new_order" />
         </parameters>
       </method>
       <method name="Set" cname="gtk_tree_store_set">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="SetColumnTypes" cname="gtk_tree_store_set_column_types">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="n_columns"/>
-          <parameter type="GType*" name="types" array="true"/>
+          <parameter type="gint" name="n_columns" />
+          <parameter type="GType*" name="types" array="1" />
         </parameters>
       </method>
       <method name="SetValist" cname="gtk_tree_store_set_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="SetValue" cname="gtk_tree_store_set_value">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GValue*" name="value"/>
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint" name="column" />
+          <parameter type="GValue*" name="value" />
         </parameters>
       </method>
       <method name="Swap" cname="gtk_tree_store_swap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeIter*" name="a"/>
-          <parameter type="GtkTreeIter*" name="b"/>
+          <parameter type="GtkTreeIter*" name="a" />
+          <parameter type="GtkTreeIter*" name="b" />
         </parameters>
       </method>
     </object>
     <object name="TreeView" cname="GtkTreeView" parent="GtkContainer">
-      <field cname="priv" type="GtkTreeViewPrivate*"/>
-      <property name="Model" cname="model" type="GtkTreeModel" readable="true" writeable="true"/>
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true"/>
-      <property name="HeadersVisible" cname="headers_visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="HeadersClickable" cname="headers_clickable" type="gboolean" writeable="true"/>
-      <property name="ExpanderColumn" cname="expander_column" type="GtkTreeViewColumn" readable="true" writeable="true"/>
-      <property name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true"/>
-      <property name="RulesHint" cname="rules_hint" type="gboolean" readable="true" writeable="true"/>
-      <property name="EnableSearch" cname="enable_search" type="gboolean" readable="true" writeable="true"/>
-      <property name="SearchColumn" cname="search_column" type="gint" readable="true" writeable="true"/>
+      <field cname="priv" type="GtkTreeViewPrivate*" />
+      <property name="Model" cname="model" type="GtkTreeModel" readable="true" writeable="true" />
+      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="HeadersVisible" cname="headers_visible" type="gboolean" readable="true" writeable="true" />
+      <property name="HeadersClickable" cname="headers_clickable" type="gboolean" writeable="true" />
+      <property name="ExpanderColumn" cname="expander_column" type="GtkTreeViewColumn" readable="true" writeable="true" />
+      <property name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
+      <property name="RulesHint" cname="rules_hint" type="gboolean" readable="true" writeable="true" />
+      <property name="EnableSearch" cname="enable_search" type="gboolean" readable="true" writeable="true" />
+      <property name="SearchColumn" cname="search_column" type="gint" readable="true" writeable="true" />
       <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkAdjustment*" name="hadjustment" />
+          <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
       <signal name="RowActivated" cname="row_activated" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </signal>
       <signal name="TestExpandRow" cname="test_expand_row" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
       <signal name="TestCollapseRow" cname="test_collapse_row" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
       <signal name="RowExpanded" cname="row_expanded" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
       <signal name="RowCollapsed" cname="row_collapsed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
       <signal name="ColumnsChanged" cname="columns_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="CursorChanged" cname="cursor_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="GtkMovementStep" name="step"/>
-          <parameter type="gint" name="count"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="GtkMovementStep" name="step" />
+          <parameter type="gint" name="count" />
         </parameters>
       </signal>
       <signal name="SelectAll" cname="select_all" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="UnselectAll" cname="unselect_all" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="SelectCursorRow" cname="select_cursor_row" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="gboolean" name="start_editing"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="gboolean" name="start_editing" />
         </parameters>
       </signal>
       <signal name="ToggleCursorRow" cname="toggle_cursor_row" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="ExpandCollapseCursorRow" cname="expand_collapse_cursor_row" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
-          <parameter type="gboolean" name="logical"/>
-          <parameter type="gboolean" name="expand"/>
-          <parameter type="gboolean" name="open_all"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
+          <parameter type="gboolean" name="logical" />
+          <parameter type="gboolean" name="expand" />
+          <parameter type="gboolean" name="open_all" />
         </parameters>
       </signal>
       <signal name="SelectCursorParent" cname="select_cursor_parent" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <signal name="StartInteractiveSearch" cname="start_interactive_search" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreeView*" name="tree_view"/>
+          <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
       <method name="AppendColumn" cname="gtk_tree_view_append_column">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
       <method name="CollapseAll" cname="gtk_tree_view_collapse_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="CollapseRow" cname="gtk_tree_view_collapse_row">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="ColumnsAutosize" cname="gtk_tree_view_columns_autosize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="CreateRowDragIcon" cname="gtk_tree_view_create_row_drag_icon">
-        <return-type type="GdkPixmap*"/>
+        <return-type type="GdkPixmap*" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="EnableModelDragDest" cname="gtk_tree_view_enable_model_drag_dest">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="gint" name="n_targets"/>
-          <parameter type="GdkDragAction" name="actions"/>
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="gint" name="n_targets" />
+          <parameter type="GdkDragAction" name="actions" />
         </parameters>
       </method>
       <method name="EnableModelDragSource" cname="gtk_tree_view_enable_model_drag_source">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkModifierType" name="start_button_mask"/>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="gint" name="n_targets"/>
-          <parameter type="GdkDragAction" name="actions"/>
+          <parameter type="GdkModifierType" name="start_button_mask" />
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="gint" name="n_targets" />
+          <parameter type="GdkDragAction" name="actions" />
         </parameters>
       </method>
       <method name="ExpandAll" cname="gtk_tree_view_expand_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ExpandRow" cname="gtk_tree_view_expand_row">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="gboolean" name="open_all"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="gboolean" name="open_all" />
         </parameters>
       </method>
       <method name="ExpandToPath" cname="gtk_tree_view_expand_to_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="GetBackgroundArea" cname="gtk_tree_view_get_background_area">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="GdkRectangle*" name="rect"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="column" />
+          <parameter type="GdkRectangle*" name="rect" />
         </parameters>
       </method>
       <method name="GetBinWindow" cname="gtk_tree_view_get_bin_window">
-        <return-type type="GdkWindow*"/>
+        <return-type type="GdkWindow*" />
       </method>
       <method name="GetCellArea" cname="gtk_tree_view_get_cell_area">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="GdkRectangle*" name="rect" pass_as="out"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="column" />
+          <parameter type="GdkRectangle*" name="rect" pass_as="out" />
         </parameters>
       </method>
       <method name="GetColumn" cname="gtk_tree_view_get_column">
-        <return-type type="GtkTreeViewColumn*"/>
+        <return-type type="GtkTreeViewColumn*" />
         <parameters>
-          <parameter type="gint" name="n"/>
+          <parameter type="gint" name="n" />
         </parameters>
       </method>
       <method name="GetColumns" cname="gtk_tree_view_get_columns">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="GetCursor" cname="gtk_tree_view_get_cursor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath**" name="path" pass_as="out"/>
-          <parameter type="GtkTreeViewColumn**" name="focus_column" pass_as="out"/>
+          <parameter type="GtkTreePath**" name="path" pass_as="out" />
+          <parameter type="GtkTreeViewColumn**" name="focus_column" pass_as="out" />
         </parameters>
       </method>
       <method name="GetDestRowAtPos" cname="gtk_tree_view_get_dest_row_at_pos">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="drag_x"/>
-          <parameter type="gint" name="drag_y"/>
-          <parameter type="GtkTreePath**" name="path" pass_as="out"/>
-          <parameter type="GtkTreeViewDropPosition*" name="pos" pass_as="out"/>
+          <parameter type="gint" name="drag_x" />
+          <parameter type="gint" name="drag_y" />
+          <parameter type="GtkTreePath**" name="path" pass_as="out" />
+          <parameter type="GtkTreeViewDropPosition*" name="pos" pass_as="out" />
         </parameters>
       </method>
       <method name="GetDragDestRow" cname="gtk_tree_view_get_drag_dest_row">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath**" name="path" pass_as="out"/>
-          <parameter type="GtkTreeViewDropPosition*" name="pos" pass_as="out"/>
+          <parameter type="GtkTreePath**" name="path" pass_as="out" />
+          <parameter type="GtkTreeViewDropPosition*" name="pos" pass_as="out" />
         </parameters>
       </method>
       <method name="GetEnableSearch" cname="gtk_tree_view_get_enable_search">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetExpanderColumn" cname="gtk_tree_view_get_expander_column">
-        <return-type type="GtkTreeViewColumn*"/>
+        <return-type type="GtkTreeViewColumn*" />
       </method>
       <method name="GetHadjustment" cname="gtk_tree_view_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetHeadersVisible" cname="gtk_tree_view_get_headers_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetModel" cname="gtk_tree_view_get_model">
-        <return-type type="GtkTreeModel*"/>
+        <return-type type="GtkTreeModel*" />
       </method>
       <method name="GetPathAtPos" cname="gtk_tree_view_get_path_at_pos" hidden="1">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="GtkTreePath**" name="path"/>
-          <parameter type="GtkTreeViewColumn**" name="column"/>
-          <parameter type="gint*" name="cell_x"/>
-          <parameter type="gint*" name="cell_y"/>
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="GtkTreePath**" name="path" />
+          <parameter type="GtkTreeViewColumn**" name="column" />
+          <parameter type="gint*" name="cell_x" />
+          <parameter type="gint*" name="cell_y" />
         </parameters>
       </method>
       <method name="GetReorderable" cname="gtk_tree_view_get_reorderable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetRulesHint" cname="gtk_tree_view_get_rules_hint">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSearchColumn" cname="gtk_tree_view_get_search_column">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetSearchEqualFunc" cname="gtk_tree_view_get_search_equal_func" hidden="1">
-        <return-type type="GtkTreeViewSearchEqualFunc"/>
+        <return-type type="GtkTreeViewSearchEqualFunc" />
       </method>
       <method name="GetSelection" cname="gtk_tree_view_get_selection">
-        <return-type type="GtkTreeSelection*"/>
+        <return-type type="GtkTreeSelection*" />
       </method>
       <method name="GetType" cname="gtk_tree_view_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVadjustment" cname="gtk_tree_view_get_vadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetVisibleRect" cname="gtk_tree_view_get_visible_rect">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkRectangle*" name="visible_rect"/>
+          <parameter type="GdkRectangle*" name="visible_rect" />
         </parameters>
       </method>
       <method name="InsertColumn" cname="gtk_tree_view_insert_column">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="gint" name="position"/>
+          <parameter type="GtkTreeViewColumn*" name="column" />
+          <parameter type="gint" name="position" />
         </parameters>
       </method>
       <method name="InsertColumnWithAttributes" cname="gtk_tree_view_insert_column_with_attributes">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gint" name="position"/>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter ellipsis="true"/>
+          <parameter type="gint" name="position" />
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GtkCellRenderer*" name="cell" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="InsertColumnWithDataFunc" cname="gtk_tree_view_insert_column_with_data_func">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="gint" name="position"/>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="GtkTreeCellDataFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GDestroyNotify" name="dnotify"/>
+          <parameter type="gint" name="position" />
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GtkCellRenderer*" name="cell" />
+          <parameter type="GtkTreeCellDataFunc" name="func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GDestroyNotify" name="dnotify" />
         </parameters>
       </method>
       <method name="MapExpandedRows" cname="gtk_tree_view_map_expanded_rows">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewMappingFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkTreeViewMappingFunc" name="func" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="ModeGetType" cname="gtk_tree_view_mode_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="MoveColumnAfter" cname="gtk_tree_view_move_column_after">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="GtkTreeViewColumn*" name="base_column"/>
+          <parameter type="GtkTreeViewColumn*" name="column" />
+          <parameter type="GtkTreeViewColumn*" name="base_column" />
         </parameters>
       </method>
-      <constructor cname="gtk_tree_view_new"/>
+      <constructor cname="gtk_tree_view_new" />
       <constructor cname="gtk_tree_view_new_with_model">
         <parameters>
-          <parameter type="GtkTreeModel*" name="model" null_ok="1"/>
+          <parameter type="GtkTreeModel*" name="model" null_ok="1" />
         </parameters>
       </constructor>
       <method name="RemoveColumn" cname="gtk_tree_view_remove_column">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
       <method name="ActivateRow" cname="gtk_tree_view_row_activated">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
       <method name="RowExpand" cname="gtk_tree_view_row_expanded">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="ScrollToCell" cname="gtk_tree_view_scroll_to_cell">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path" null_ok="1"/>
-          <parameter type="GtkTreeViewColumn*" name="column" null_ok="1"/>
-          <parameter type="gboolean" name="use_align"/>
-          <parameter type="gfloat" name="row_align"/>
-          <parameter type="gfloat" name="col_align"/>
+          <parameter type="GtkTreePath*" name="path" null_ok="1" />
+          <parameter type="GtkTreeViewColumn*" name="column" null_ok="1" />
+          <parameter type="gboolean" name="use_align" />
+          <parameter type="gfloat" name="row_align" />
+          <parameter type="gfloat" name="col_align" />
         </parameters>
       </method>
       <method name="ScrollToPoint" cname="gtk_tree_view_scroll_to_point">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="tree_x"/>
-          <parameter type="gint" name="tree_y"/>
+          <parameter type="gint" name="tree_x" />
+          <parameter type="gint" name="tree_y" />
         </parameters>
       </method>
       <method name="SetColumnDragFunction" cname="gtk_tree_view_set_column_drag_function">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewColumnDropFunc" name="func"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GtkTreeViewColumnDropFunc" name="func" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="SetCursor" cname="gtk_tree_view_set_cursor">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="focus_column"/>
-          <parameter type="gboolean" name="start_editing"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="focus_column" />
+          <parameter type="gboolean" name="start_editing" />
         </parameters>
       </method>
       <method name="SetCursorOnCell" cname="gtk_tree_view_set_cursor_on_cell">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="focus_column"/>
-          <parameter type="GtkCellRenderer*" name="focus_cell"/>
-          <parameter type="gboolean" name="start_editing"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewColumn*" name="focus_column" />
+          <parameter type="GtkCellRenderer*" name="focus_cell" />
+          <parameter type="gboolean" name="start_editing" />
         </parameters>
       </method>
       <method name="SetDestroyCountFunc" cname="gtk_tree_view_set_destroy_count_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeDestroyCountFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GtkTreeDestroyCountFunc" name="func" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="SetDragDestRow" cname="gtk_tree_view_set_drag_dest_row">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewDropPosition" name="pos"/>
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeViewDropPosition" name="pos" />
         </parameters>
       </method>
       <method name="SetEnableSearch" cname="gtk_tree_view_set_enable_search">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="enable_search"/>
+          <parameter type="gboolean" name="enable_search" />
         </parameters>
       </method>
       <method name="SetExpanderColumn" cname="gtk_tree_view_set_expander_column">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </method>
       <method name="SetHadjustment" cname="gtk_tree_view_set_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="SetHeadersClickable" cname="gtk_tree_view_set_headers_clickable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetHeadersVisible" cname="gtk_tree_view_set_headers_visible">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="headers_visible"/>
+          <parameter type="gboolean" name="headers_visible" />
         </parameters>
       </method>
       <method name="SetModel" cname="gtk_tree_view_set_model">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="model" null_ok="1"/>
+          <parameter type="GtkTreeModel*" name="model" null_ok="1" />
         </parameters>
       </method>
       <method name="SetReorderable" cname="gtk_tree_view_set_reorderable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="reorderable"/>
+          <parameter type="gboolean" name="reorderable" />
         </parameters>
       </method>
       <method name="SetRulesHint" cname="gtk_tree_view_set_rules_hint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetSearchColumn" cname="gtk_tree_view_set_search_column">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="column"/>
+          <parameter type="gint" name="column" />
         </parameters>
       </method>
       <method name="SetSearchEqualFunc" cname="gtk_tree_view_set_search_equal_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewSearchEqualFunc" name="search_equal_func"/>
-          <parameter type="gpointer" name="search_user_data"/>
-          <parameter type="GtkDestroyNotify" name="search_destroy"/>
+          <parameter type="GtkTreeViewSearchEqualFunc" name="search_equal_func" />
+          <parameter type="gpointer" name="search_user_data" />
+          <parameter type="GtkDestroyNotify" name="search_destroy" />
         </parameters>
       </method>
       <method name="SetVadjustment" cname="gtk_tree_view_set_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </method>
       <method name="TreeToWidgetCoords" cname="gtk_tree_view_tree_to_widget_coords">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="tx"/>
-          <parameter type="gint" name="ty"/>
-          <parameter type="gint*" name="wx"/>
-          <parameter type="gint*" name="wy"/>
+          <parameter type="gint" name="tx" />
+          <parameter type="gint" name="ty" />
+          <parameter type="gint*" name="wx" />
+          <parameter type="gint*" name="wy" />
         </parameters>
       </method>
       <method name="UnsetRowsDragDest" cname="gtk_tree_view_unset_rows_drag_dest">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UnsetRowsDragSource" cname="gtk_tree_view_unset_rows_drag_source">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="WidgetToTreeCoords" cname="gtk_tree_view_widget_to_tree_coords">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="wx"/>
-          <parameter type="gint" name="wy"/>
-          <parameter type="gint*" name="tx"/>
-          <parameter type="gint*" name="ty"/>
+          <parameter type="gint" name="wx" />
+          <parameter type="gint" name="wy" />
+          <parameter type="gint*" name="tx" />
+          <parameter type="gint*" name="ty" />
         </parameters>
       </method>
     </object>
     <object name="TreeViewColumn" cname="GtkTreeViewColumn" parent="GtkObject">
-      <field cname="tree_view" type="GtkWidget*"/>
-      <field cname="button" type="GtkWidget*"/>
-      <field cname="child" type="GtkWidget*"/>
-      <field cname="arrow" type="GtkWidget*"/>
-      <field cname="alignment" type="GtkWidget*"/>
-      <field cname="window" type="GdkWindow*"/>
-      <field cname="editable_widget" type="GtkCellEditable*"/>
-      <field cname="xalign" type="gfloat"/>
-      <field cname="property_changed_signal" type="guint"/>
-      <field cname="spacing" type="gint"/>
-      <field cname="column_type" type="GtkTreeViewColumnSizing"/>
-      <field cname="requested_width" type="gint"/>
-      <field cname="button_request" type="gint"/>
-      <field cname="resized_width" type="gint"/>
-      <field cname="width" type="gint"/>
-      <field cname="fixed_width" type="gint"/>
-      <field cname="min_width" type="gint"/>
-      <field cname="max_width" type="gint"/>
-      <field cname="drag_x" type="gint"/>
-      <field cname="drag_y" type="gint"/>
-      <field cname="title" type="gchar*"/>
-      <field cname="cell_list" type="GList*"/>
-      <field cname="sort_clicked_signal" type="guint"/>
-      <field cname="sort_column_changed_signal" type="guint"/>
-      <field cname="sort_column_id" type="gint"/>
-      <field cname="sort_order" type="GtkSortType"/>
-      <field cname="visible" bits="1" type="guint"/>
-      <field cname="resizable" bits="1" type="guint"/>
-      <field cname="clickable" bits="1" type="guint"/>
-      <field cname="dirty" bits="1" type="guint"/>
-      <field cname="show_sort_indicator" bits="1" type="guint"/>
-      <field cname="maybe_reordered" bits="1" type="guint"/>
-      <field cname="reorderable" bits="1" type="guint"/>
-      <field cname="use_resized_width" bits="1" type="guint"/>
+      <field cname="tree_view" type="GtkWidget*" />
+      <field cname="button" type="GtkWidget*" />
+      <field cname="child" type="GtkWidget*" />
+      <field cname="arrow" type="GtkWidget*" />
+      <field cname="alignment" type="GtkWidget*" />
+      <field cname="window" type="GdkWindow*" />
+      <field cname="editable_widget" type="GtkCellEditable*" />
+      <field cname="xalign" type="gfloat" />
+      <field cname="property_changed_signal" type="guint" />
+      <field cname="spacing" type="gint" />
+      <field cname="column_type" type="GtkTreeViewColumnSizing" />
+      <field cname="requested_width" type="gint" />
+      <field cname="button_request" type="gint" />
+      <field cname="resized_width" type="gint" />
+      <field cname="width" type="gint" />
+      <field cname="fixed_width" type="gint" />
+      <field cname="min_width" type="gint" />
+      <field cname="max_width" type="gint" />
+      <field cname="drag_x" type="gint" />
+      <field cname="drag_y" type="gint" />
+      <field cname="title" type="gchar*" />
+      <field cname="cell_list" type="GList*" />
+      <field cname="sort_clicked_signal" type="guint" />
+      <field cname="sort_column_changed_signal" type="guint" />
+      <field cname="sort_column_id" type="gint" />
+      <field cname="sort_order" type="GtkSortType" />
+      <field cname="visible" bits="1" type="guint" />
+      <field cname="resizable" bits="1" type="guint" />
+      <field cname="clickable" bits="1" type="guint" />
+      <field cname="dirty" bits="1" type="guint" />
+      <field cname="show_sort_indicator" bits="1" type="guint" />
+      <field cname="maybe_reordered" bits="1" type="guint" />
+      <field cname="reorderable" bits="1" type="guint" />
+      <field cname="use_resized_width" bits="1" type="guint" />
       <signal name="Clicked" cname="clicked" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewColumn*" name="tree_column"/>
+          <parameter type="GtkTreeViewColumn*" name="tree_column" />
         </parameters>
       </signal>
-      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="Resizable" cname="resizable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Width" cname="width" type="gint" readable="true"/>
-      <property name="Sizing" cname="sizing" type="GtkTreeViewColumnSizing" readable="true" writeable="true"/>
-      <property name="FixedWidth" cname="fixed_width" type="gint" readable="true" writeable="true"/>
-      <property name="MinWidth" cname="min_width" type="gint" readable="true" writeable="true"/>
-      <property name="MaxWidth" cname="max_width" type="gint" readable="true" writeable="true"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="Clickable" cname="clickable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Widget" cname="widget" type="GtkWidget" readable="true" writeable="true"/>
-      <property name="Alignment" cname="alignment" type="gfloat" readable="true" writeable="true"/>
-      <property name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true"/>
-      <property name="SortIndicator" cname="sort_indicator" type="gboolean" readable="true" writeable="true"/>
-      <property name="SortOrder" cname="sort_order" type="GtkSortType" readable="true" writeable="true"/>
+      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
+      <property name="Resizable" cname="resizable" type="gboolean" readable="true" writeable="true" />
+      <property name="Width" cname="width" type="gint" readable="true" />
+      <property name="Sizing" cname="sizing" type="GtkTreeViewColumnSizing" readable="true" writeable="true" />
+      <property name="FixedWidth" cname="fixed_width" type="gint" readable="true" writeable="true" />
+      <property name="MinWidth" cname="min_width" type="gint" readable="true" writeable="true" />
+      <property name="MaxWidth" cname="max_width" type="gint" readable="true" writeable="true" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="Clickable" cname="clickable" type="gboolean" readable="true" writeable="true" />
+      <property name="Widget" cname="widget" type="GtkWidget" readable="true" writeable="true" />
+      <property name="Alignment" cname="alignment" type="gfloat" readable="true" writeable="true" />
+      <property name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
+      <property name="SortIndicator" cname="sort_indicator" type="gboolean" readable="true" writeable="true" />
+      <property name="SortOrder" cname="sort_order" type="GtkSortType" readable="true" writeable="true" />
       <method name="AddAttribute" cname="gtk_tree_view_column_add_attribute">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="const-gchar*" name="attribute"/>
-          <parameter type="gint" name="column"/>
+          <parameter type="GtkCellRenderer*" name="cell_renderer" />
+          <parameter type="const-gchar*" name="attribute" />
+          <parameter type="gint" name="column" />
         </parameters>
       </method>
       <method name="CellGetPosition" cname="gtk_tree_view_column_cell_get_position">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="gint*" name="start_pos"/>
-          <parameter type="gint*" name="width"/>
+          <parameter type="GtkCellRenderer*" name="cell_renderer" />
+          <parameter type="gint*" name="start_pos" />
+          <parameter type="gint*" name="width" />
         </parameters>
       </method>
       <method name="CellGetSize" cname="gtk_tree_view_column_cell_get_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="gint*" name="x_offset"/>
-          <parameter type="gint*" name="y_offset"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="GdkRectangle*" name="cell_area" />
+          <parameter type="gint*" name="x_offset" />
+          <parameter type="gint*" name="y_offset" />
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="CellIsVisible" cname="gtk_tree_view_column_cell_is_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="CellSetCellData" cname="gtk_tree_view_column_cell_set_cell_data">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gboolean" name="is_expander"/>
-          <parameter type="gboolean" name="is_expanded"/>
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gboolean" name="is_expander" />
+          <parameter type="gboolean" name="is_expanded" />
         </parameters>
       </method>
       <method name="Clear" cname="gtk_tree_view_column_clear">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ClearAttributes" cname="gtk_tree_view_column_clear_attributes">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
+          <parameter type="GtkCellRenderer*" name="cell_renderer" />
         </parameters>
       </method>
       <method name="Click" cname="gtk_tree_view_column_clicked">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="FocusCell" cname="gtk_tree_view_column_focus_cell">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell"/>
+          <parameter type="GtkCellRenderer*" name="cell" />
         </parameters>
       </method>
       <method name="GetAlignment" cname="gtk_tree_view_column_get_alignment">
-        <return-type type="gfloat"/>
+        <return-type type="gfloat" />
       </method>
       <method name="GetCellRenderers" cname="gtk_tree_view_column_get_cell_renderers">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="GetClickable" cname="gtk_tree_view_column_get_clickable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetFixedWidth" cname="gtk_tree_view_column_get_fixed_width">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMaxWidth" cname="gtk_tree_view_column_get_max_width">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMinWidth" cname="gtk_tree_view_column_get_min_width">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetReorderable" cname="gtk_tree_view_column_get_reorderable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetResizable" cname="gtk_tree_view_column_get_resizable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSizing" cname="gtk_tree_view_column_get_sizing">
-        <return-type type="GtkTreeViewColumnSizing"/>
+        <return-type type="GtkTreeViewColumnSizing" />
       </method>
       <method name="GetSortColumnId" cname="gtk_tree_view_column_get_sort_column_id">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetSortIndicator" cname="gtk_tree_view_column_get_sort_indicator">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSortOrder" cname="gtk_tree_view_column_get_sort_order">
-        <return-type type="GtkSortType"/>
+        <return-type type="GtkSortType" />
       </method>
       <method name="GetSpacing" cname="gtk_tree_view_column_get_spacing">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetTitle" cname="gtk_tree_view_column_get_title">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_tree_view_column_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisible" cname="gtk_tree_view_column_get_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetWidget" cname="gtk_tree_view_column_get_widget">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetWidth" cname="gtk_tree_view_column_get_width">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
-      <constructor cname="gtk_tree_view_column_new"/>
+      <constructor cname="gtk_tree_view_column_new" />
       <constructor cname="gtk_tree_view_column_new_with_attributes">
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="title" />
+          <parameter type="GtkCellRenderer*" name="cell" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <method name="PackEnd" cname="gtk_tree_view_column_pack_end">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="gboolean" name="expand"/>
+          <parameter type="GtkCellRenderer*" name="cell" />
+          <parameter type="gboolean" name="expand" />
         </parameters>
       </method>
       <method name="PackStart" cname="gtk_tree_view_column_pack_start">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="gboolean" name="expand"/>
+          <parameter type="GtkCellRenderer*" name="cell" />
+          <parameter type="gboolean" name="expand" />
         </parameters>
       </method>
       <method name="SetAlignment" cname="gtk_tree_view_column_set_alignment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gfloat" name="xalign"/>
+          <parameter type="gfloat" name="xalign" />
         </parameters>
       </method>
       <method name="SetAttributes" cname="gtk_tree_view_column_set_attributes">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkCellRenderer*" name="cell_renderer" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="SetCellDataFunc" cname="gtk_tree_view_column_set_cell_data_func">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="GtkTreeCellDataFunc" name="func"/>
-          <parameter type="gpointer" name="func_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="GtkCellRenderer*" name="cell_renderer" />
+          <parameter type="GtkTreeCellDataFunc" name="func" />
+          <parameter type="gpointer" name="func_data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="SetClickable" cname="gtk_tree_view_column_set_clickable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="clickable"/>
+          <parameter type="gboolean" name="clickable" />
         </parameters>
       </method>
       <method name="SetFixedWidth" cname="gtk_tree_view_column_set_fixed_width">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="fixed_width"/>
+          <parameter type="gint" name="fixed_width" />
         </parameters>
       </method>
       <method name="SetMaxWidth" cname="gtk_tree_view_column_set_max_width">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="max_width"/>
+          <parameter type="gint" name="max_width" />
         </parameters>
       </method>
       <method name="SetMinWidth" cname="gtk_tree_view_column_set_min_width">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="min_width"/>
+          <parameter type="gint" name="min_width" />
         </parameters>
       </method>
       <method name="SetReorderable" cname="gtk_tree_view_column_set_reorderable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="reorderable"/>
+          <parameter type="gboolean" name="reorderable" />
         </parameters>
       </method>
       <method name="SetResizable" cname="gtk_tree_view_column_set_resizable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="resizable"/>
+          <parameter type="gboolean" name="resizable" />
         </parameters>
       </method>
       <method name="SetSizing" cname="gtk_tree_view_column_set_sizing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTreeViewColumnSizing" name="type"/>
+          <parameter type="GtkTreeViewColumnSizing" name="type" />
         </parameters>
       </method>
       <method name="SetSortColumnId" cname="gtk_tree_view_column_set_sort_column_id">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="sort_column_id"/>
+          <parameter type="gint" name="sort_column_id" />
         </parameters>
       </method>
       <method name="SetSortIndicator" cname="gtk_tree_view_column_set_sort_indicator">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetSortOrder" cname="gtk_tree_view_column_set_sort_order">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkSortType" name="order"/>
+          <parameter type="GtkSortType" name="order" />
         </parameters>
       </method>
       <method name="SetSpacing" cname="gtk_tree_view_column_set_spacing">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="spacing"/>
+          <parameter type="gint" name="spacing" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gtk_tree_view_column_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="SetVisible" cname="gtk_tree_view_column_set_visible">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="visible"/>
+          <parameter type="gboolean" name="visible" />
         </parameters>
       </method>
       <method name="SetWidget" cname="gtk_tree_view_column_set_widget">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </object>
     <object name="VBox" cname="GtkVBox" parent="GtkBox">
       <method name="GetType" cname="gtk_vbox_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_vbox_new">
         <parameters>
-          <parameter type="gboolean" name="homogeneous"/>
-          <parameter type="gint" name="spacing"/>
+          <parameter type="gboolean" name="homogeneous" />
+          <parameter type="gint" name="spacing" />
         </parameters>
       </constructor>
     </object>
     <object name="VButtonBox" cname="GtkVButtonBox" parent="GtkButtonBox">
       <method name="GetType" cname="gtk_vbutton_box_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_vbutton_box_new"/>
+      <constructor cname="gtk_vbutton_box_new" />
     </object>
     <object name="Viewport" cname="GtkViewport" parent="GtkBin" disabledefaultconstructor="1">
-      <field cname="shadow_type" type="GtkShadowType"/>
-      <field cname="view_window" type="GdkWindow*"/>
-      <field cname="bin_window" type="GdkWindow*"/>
-      <field cname="hadjustment" type="GtkAdjustment*"/>
-      <field cname="vadjustment" type="GtkAdjustment*"/>
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true"/>
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true"/>
-      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true"/>
+      <field cname="shadow_type" type="GtkShadowType" />
+      <field cname="view_window" type="GdkWindow*" />
+      <field cname="bin_window" type="GdkWindow*" />
+      <field cname="hadjustment" type="GtkAdjustment*" />
+      <field cname="vadjustment" type="GtkAdjustment*" />
+      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="ShadowType" cname="shadow_type" type="GtkShadowType" readable="true" writeable="true" />
       <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkViewport*" name="viewport"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
+          <parameter type="GtkViewport*" name="viewport" />
+          <parameter type="GtkAdjustment*" name="hadjustment" />
+          <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
       <method name="GetHadjustment" cname="gtk_viewport_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <method name="GetShadowType" cname="gtk_viewport_get_shadow_type">
-        <return-type type="GtkShadowType"/>
+        <return-type type="GtkShadowType" />
       </method>
       <method name="GetType" cname="gtk_viewport_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVadjustment" cname="gtk_viewport_get_vadjustment">
-        <return-type type="GtkAdjustment*"/>
+        <return-type type="GtkAdjustment*" />
       </method>
       <constructor cname="gtk_viewport_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1"/>
-          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1" />
+          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1" />
         </parameters>
       </constructor>
       <method name="SetHadjustment" cname="gtk_viewport_set_hadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </method>
       <method name="SetShadowType" cname="gtk_viewport_set_shadow_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkShadowType" name="type"/>
+          <parameter type="GtkShadowType" name="type" />
         </parameters>
       </method>
       <method name="SetVadjustment" cname="gtk_viewport_set_vadjustment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </method>
     </object>
     <object name="VPaned" cname="GtkVPaned" parent="GtkPaned">
       <method name="GetType" cname="gtk_vpaned_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_vpaned_new"/>
+      <constructor cname="gtk_vpaned_new" />
     </object>
     <object name="VRuler" cname="GtkVRuler" parent="GtkRuler">
       <method name="GetType" cname="gtk_vruler_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_vruler_new"/>
+      <constructor cname="gtk_vruler_new" />
     </object>
     <object name="VScale" cname="GtkVScale" parent="GtkScale">
       <method name="GetType" cname="gtk_vscale_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_vscale_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </constructor>
       <constructor cname="gtk_vscale_new_with_range">
         <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
-          <parameter type="gdouble" name="step"/>
+          <parameter type="gdouble" name="min" />
+          <parameter type="gdouble" name="max" />
+          <parameter type="gdouble" name="step" />
         </parameters>
       </constructor>
     </object>
     <object name="VScrollbar" cname="GtkVScrollbar" parent="GtkScrollbar">
       <method name="GetType" cname="gtk_vscrollbar_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <constructor cname="gtk_vscrollbar_new">
         <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="adjustment" null_ok="1" />
         </parameters>
       </constructor>
     </object>
     <object name="VSeparator" cname="GtkVSeparator" parent="GtkSeparator">
       <method name="GetType" cname="gtk_vseparator_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_vseparator_new"/>
+      <constructor cname="gtk_vseparator_new" />
     </object>
     <object name="Widget" cname="GtkWidget" parent="GtkObject">
-      <field cname="private_flags" type="guint16"/>
-      <field cname="state" type="guint8"/>
-      <field cname="saved_state" type="guint8"/>
-      <field cname="name" type="gchar*"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="requisition" type="GtkRequisition"/>
-      <field cname="allocation" type="GtkAllocation"/>
-      <field cname="window" type="GdkWindow*"/>
-      <field cname="parent" type="GtkWidget*"/>
-      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true"/>
-      <property name="Parent" cname="parent" type="GtkContainer" readable="true" writeable="true"/>
-      <property name="WidthRequest" cname="width_request" type="gint" readable="true" writeable="true"/>
-      <property name="HeightRequest" cname="height_request" type="gint" readable="true" writeable="true"/>
-      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true"/>
-      <property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true"/>
-      <property name="AppPaintable" cname="app_paintable" type="gboolean" readable="true" writeable="true"/>
-      <property name="CanFocus" cname="can_focus" type="gboolean" readable="true" writeable="true"/>
-      <property name="HasFocus" cname="has_focus" type="gboolean" readable="true" writeable="true"/>
-      <property name="IsFocus" cname="is_focus" type="gboolean" readable="true" writeable="true"/>
-      <property name="CanDefault" cname="can_default" type="gboolean" readable="true" writeable="true"/>
-      <property name="HasDefault" cname="has_default" type="gboolean" readable="true" writeable="true"/>
-      <property name="ReceivesDefault" cname="receives_default" type="gboolean" readable="true" writeable="true"/>
-      <property name="CompositeChild" cname="composite_child" type="gboolean" readable="true"/>
-      <property name="Style" cname="style" type="GtkStyle" readable="true" writeable="true"/>
-      <property name="Events" cname="events" type="GdkEventMask" readable="true" writeable="true"/>
-      <property name="ExtensionEvents" cname="extension_events" type="GdkExtensionMode" readable="true" writeable="true"/>
+      <field cname="private_flags" type="guint16" />
+      <field cname="state" type="guint8" />
+      <field cname="saved_state" type="guint8" />
+      <field cname="name" type="gchar*" />
+      <field cname="style" type="GtkStyle*" />
+      <field cname="requisition" type="GtkRequisition" />
+      <field cname="allocation" type="GtkAllocation" />
+      <field cname="window" type="GdkWindow*" />
+      <field cname="parent" type="GtkWidget*" />
+      <property name="Name" cname="name" type="gchar*" readable="true" writeable="true" />
+      <property name="Parent" cname="parent" type="GtkContainer" readable="true" writeable="true" />
+      <property name="WidthRequest" cname="width_request" type="gint" readable="true" writeable="true" />
+      <property name="HeightRequest" cname="height_request" type="gint" readable="true" writeable="true" />
+      <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
+      <property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true" />
+      <property name="AppPaintable" cname="app_paintable" type="gboolean" readable="true" writeable="true" />
+      <property name="CanFocus" cname="can_focus" type="gboolean" readable="true" writeable="true" />
+      <property name="HasFocus" cname="has_focus" type="gboolean" readable="true" writeable="true" />
+      <property name="IsFocus" cname="is_focus" type="gboolean" readable="true" writeable="true" />
+      <property name="CanDefault" cname="can_default" type="gboolean" readable="true" writeable="true" />
+      <property name="HasDefault" cname="has_default" type="gboolean" readable="true" writeable="true" />
+      <property name="ReceivesDefault" cname="receives_default" type="gboolean" readable="true" writeable="true" />
+      <property name="CompositeChild" cname="composite_child" type="gboolean" readable="true" />
+      <property name="Style" cname="style" type="GtkStyle" readable="true" writeable="true" />
+      <property name="Events" cname="events" type="GdkEventMask" readable="true" writeable="true" />
+      <property name="ExtensionEvents" cname="extension_events" type="GdkExtensionMode" readable="true" writeable="true" />
       <signal name="Shown" cname="show" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Hidden" cname="hide" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Mapped" cname="map" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Unmapped" cname="unmap" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Realized" cname="realize" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Unrealized" cname="unrealize" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="SizeRequested" cname="size_request" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkRequisition*" name="requisition"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkRequisition*" name="requisition" />
         </parameters>
       </signal>
       <signal name="SizeAllocated" cname="size_allocate" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkAllocation*" name="allocation"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkAllocation*" name="allocation" />
         </parameters>
       </signal>
       <signal name="StateChanged" cname="state_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkStateType" name="previous_state"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkStateType" name="previous_state" />
         </parameters>
       </signal>
       <signal name="ParentSet" cname="parent_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkWidget*" name="previous_parent"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkWidget*" name="previous_parent" />
         </parameters>
       </signal>
       <signal name="HierarchyChanged" cname="hierarchy_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkWidget*" name="previous_toplevel"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkWidget*" name="previous_toplevel" />
         </parameters>
       </signal>
       <signal name="StyleSet" cname="style_set" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkStyle*" name="previous_style"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkStyle*" name="previous_style" />
         </parameters>
       </signal>
       <signal name="DirectionChanged" cname="direction_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkTextDirection" name="previous_direction"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkTextDirection" name="previous_direction" />
         </parameters>
       </signal>
       <signal name="GrabNotify" cname="grab_notify" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gboolean" name="was_grabbed"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gboolean" name="was_grabbed" />
         </parameters>
       </signal>
       <signal name="ChildNotified" cname="child_notify" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GParamSpec*" name="pspec"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </signal>
       <signal name="MnemonicActivated" cname="mnemonic_activate" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gboolean" name="group_cycling"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gboolean" name="group_cycling" />
         </parameters>
       </signal>
       <signal name="FocusGrabbed" cname="grab_focus" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="Focused" cname="focus" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
       <signal name="WidgetEvent" cname="event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
       <signal name="EventAfter" cname="event-after">
-        <return-type type="GNone"/>
+        <return-type type="GNone" />
         <parameters>
-          <parameter name="p0" type="GdkEvent|gSignalTypeStaticScope);"/>
+          <parameter name="p0" type="GdkEvent|gSignalTypeStaticScope);" />
         </parameters>
       </signal>
       <signal name="ButtonPressEvent" cname="button_press_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventButton*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventButton*" name="event" />
         </parameters>
       </signal>
       <signal name="ButtonReleaseEvent" cname="button_release_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventButton*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventButton*" name="event" />
         </parameters>
       </signal>
       <signal name="ScrollEvent" cname="scroll_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventScroll*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventScroll*" name="event" />
         </parameters>
       </signal>
       <signal name="MotionNotifyEvent" cname="motion_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventMotion*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventMotion*" name="event" />
         </parameters>
       </signal>
       <signal name="DeleteEvent" cname="delete_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventAny*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
       <signal name="DestroyEvent" cname="destroy_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventAny*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
       <signal name="ExposeEvent" cname="expose_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventExpose*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventExpose*" name="event" />
         </parameters>
       </signal>
       <signal name="KeyPressEvent" cname="key_press_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventKey*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventKey*" name="event" />
         </parameters>
       </signal>
       <signal name="KeyReleaseEvent" cname="key_release_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventKey*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventKey*" name="event" />
         </parameters>
       </signal>
       <signal name="EnterNotifyEvent" cname="enter_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventCrossing*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventCrossing*" name="event" />
         </parameters>
       </signal>
       <signal name="LeaveNotifyEvent" cname="leave_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventCrossing*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventCrossing*" name="event" />
         </parameters>
       </signal>
       <signal name="ConfigureEvent" cname="configure_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventConfigure*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventConfigure*" name="event" />
         </parameters>
       </signal>
       <signal name="FocusInEvent" cname="focus_in_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventFocus*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventFocus*" name="event" />
         </parameters>
       </signal>
       <signal name="FocusOutEvent" cname="focus_out_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventFocus*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventFocus*" name="event" />
         </parameters>
       </signal>
       <signal name="MapEvent" cname="map_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventAny*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
       <signal name="UnmapEvent" cname="unmap_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventAny*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
       <signal name="PropertyNotifyEvent" cname="property_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventProperty*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventProperty*" name="event" />
         </parameters>
       </signal>
       <signal name="SelectionClearEvent" cname="selection_clear_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventSelection*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
       <signal name="SelectionRequestEvent" cname="selection_request_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventSelection*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
       <signal name="SelectionNotifyEvent" cname="selection_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventSelection*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
       <signal name="SelectionReceived" cname="selection_received" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="SelectionGet" cname="selection_get" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="guint" name="info"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="guint" name="info" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="ProximityInEvent" cname="proximity_in_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventProximity*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventProximity*" name="event" />
         </parameters>
       </signal>
       <signal name="ProximityOutEvent" cname="proximity_out_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventProximity*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventProximity*" name="event" />
         </parameters>
       </signal>
       <signal name="DragLeave" cname="drag_leave" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="DragBegin" cname="drag_begin" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </signal>
       <signal name="DragEnd" cname="drag_end" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </signal>
       <signal name="DragDataDelete" cname="drag_data_delete" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </signal>
       <signal name="DragMotion" cname="drag_motion" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="DragDrop" cname="drag_drop" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="DragDataGet" cname="drag_data_get" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="guint" name="info"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="guint" name="info" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="DragDataReceived" cname="drag_data_received" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="guint" name="info"/>
-          <parameter type="guint" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="guint" name="info" />
+          <parameter type="guint" name="time_" />
         </parameters>
       </signal>
       <signal name="VisibilityNotifyEvent" cname="visibility_notify_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventVisibility*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventVisibility*" name="event" />
         </parameters>
       </signal>
       <signal name="ClientEvent" cname="client_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventClient*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventClient*" name="event" />
         </parameters>
       </signal>
       <signal name="NoExposeEvent" cname="no_expose_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventAny*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
       <signal name="WindowStateEvent" cname="window_state_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventWindowState*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventWindowState*" name="event" />
         </parameters>
       </signal>
       <signal name="PopupMenu" cname="popup_menu" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
       <signal name="HelpShown" cname="show_help" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkWidgetHelpType" name="help_type"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkWidgetHelpType" name="help_type" />
         </parameters>
       </signal>
       <signal name="AccelClosuresChanged" cname="accel_closures_changed">
-        <return-type type="GNone"/>
+        <return-type type="GNone" />
         <parameters>
-          <parameter name="p0" type=""/>
+          <parameter name="p0" type="" />
         </parameters>
       </signal>
       <signal name="ScreenChanged" cname="screen_changed" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkScreen*" name="previous_screen"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkScreen*" name="previous_screen" />
         </parameters>
       </signal>
       <implements>
-        <interface cname="AtkImplementor"/>
+        <interface cname="AtkImplementor" />
       </implements>
       <method name="Activate" cname="gtk_widget_activate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AddAccelerator" cname="gtk_widget_add_accelerator">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_signal"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
-          <parameter type="GtkAccelFlags" name="accel_flags"/>
+          <parameter type="const-gchar*" name="accel_signal" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
+          <parameter type="GtkAccelFlags" name="accel_flags" />
         </parameters>
       </method>
       <method name="AddEvents" cname="gtk_widget_add_events">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="events"/>
+          <parameter type="gint" name="events" />
         </parameters>
       </method>
       <method name="ChildFocus" cname="gtk_widget_child_focus">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </method>
       <method name="ChildNotify" cname="gtk_widget_child_notify">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="child_property"/>
+          <parameter type="const-gchar*" name="child_property" />
         </parameters>
       </method>
       <method name="ClassFindStyleProperty" cname="gtk_widget_class_find_style_property" shared="true">
-        <return-type type="GParamSpec*"/>
+        <return-type type="GParamSpec*" />
         <parameters>
-          <parameter type="GtkWidgetClass*" name="klass"/>
-          <parameter type="const-gchar*" name="property_name"/>
+          <parameter type="GtkWidgetClass*" name="klass" />
+          <parameter type="const-gchar*" name="property_name" />
         </parameters>
       </method>
       <method name="ClassInstallStyleProperty" cname="gtk_widget_class_install_style_property" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidgetClass*" name="klass"/>
-          <parameter type="GParamSpec*" name="pspec"/>
+          <parameter type="GtkWidgetClass*" name="klass" />
+          <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </method>
       <method name="ClassInstallStylePropertyParser" cname="gtk_widget_class_install_style_property_parser" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidgetClass*" name="klass"/>
-          <parameter type="GParamSpec*" name="pspec"/>
-          <parameter type="GtkRcPropertyParser" name="parser"/>
+          <parameter type="GtkWidgetClass*" name="klass" />
+          <parameter type="GParamSpec*" name="pspec" />
+          <parameter type="GtkRcPropertyParser" name="parser" />
         </parameters>
       </method>
       <method name="ClassListStyleProperties" cname="gtk_widget_class_list_style_properties" shared="true">
-        <return-type type="GParamSpec**"/>
+        <return-type type="GParamSpec**" />
         <parameters>
-          <parameter type="GtkWidgetClass*" name="klass"/>
-          <parameter type="guint*" name="n_properties"/>
+          <parameter type="GtkWidgetClass*" name="klass" />
+          <parameter type="guint*" name="n_properties" />
         </parameters>
       </method>
       <method name="ClassPath" cname="gtk_widget_class_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint*" name="path_length"/>
-          <parameter type="gchar**" name="path" pass_as="out"/>
-          <parameter type="gchar**" name="path_reversed" pass_as="out"/>
+          <parameter type="guint*" name="path_length" />
+          <parameter type="gchar**" name="path" pass_as="out" />
+          <parameter type="gchar**" name="path_reversed" pass_as="out" />
         </parameters>
       </method>
       <method name="CreatePangoContext" cname="gtk_widget_create_pango_context">
-        <return-type type="PangoContext*"/>
+        <return-type type="PangoContext*" />
       </method>
       <method name="CreatePangoLayout" cname="gtk_widget_create_pango_layout">
-        <return-type type="PangoLayout*"/>
+        <return-type type="PangoLayout*" />
         <parameters>
-          <parameter type="const-gchar*" name="text"/>
+          <parameter type="const-gchar*" name="text" />
         </parameters>
       </method>
       <method name="Destroy" cname="gtk_widget_destroy">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Destroyed" cname="gtk_widget_destroyed" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget**" name="widget_pointer"/>
+          <parameter type="GtkWidget**" name="widget_pointer" />
         </parameters>
       </method>
       <method name="EnsureStyle" cname="gtk_widget_ensure_style">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ProcessEvent" cname="gtk_widget_event">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="FreezeChildNotify" cname="gtk_widget_freeze_child_notify">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetAccessible" cname="gtk_widget_get_accessible">
-        <return-type type="AtkObject*"/>
+        <return-type type="AtkObject*" />
       </method>
       <method name="GetAncestor" cname="gtk_widget_get_ancestor">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GType" name="widget_type"/>
+          <parameter type="GType" name="widget_type" />
         </parameters>
       </method>
       <method name="GetChildRequisition" cname="gtk_widget_get_child_requisition">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRequisition*" name="requisition"/>
+          <parameter type="GtkRequisition*" name="requisition" />
         </parameters>
       </method>
       <method name="GetChildVisible" cname="gtk_widget_get_child_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetClipboard" cname="gtk_widget_get_clipboard">
-        <return-type type="GtkClipboard*"/>
+        <return-type type="GtkClipboard*" />
         <parameters>
-          <parameter type="GdkAtom" name="selection"/>
+          <parameter type="GdkAtom" name="selection" />
         </parameters>
       </method>
       <method name="GetColormap" cname="gtk_widget_get_colormap" needs_ref="1">
-        <return-type type="GdkColormap*"/>
+        <return-type type="GdkColormap*" />
       </method>
       <method name="GetCompositeName" cname="gtk_widget_get_composite_name">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetDefaultColormap" cname="gtk_widget_get_default_colormap" shared="true" needs_ref="1">
-        <return-type type="GdkColormap*"/>
+        <return-type type="GdkColormap*" />
       </method>
       <method name="GetDefaultDirection" cname="gtk_widget_get_default_direction" shared="true">
-        <return-type type="GtkTextDirection"/>
+        <return-type type="GtkTextDirection" />
       </method>
       <method name="GetDefaultStyle" cname="gtk_widget_get_default_style" shared="true" needs_ref="1">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
       </method>
       <method name="GetDefaultVisual" cname="gtk_widget_get_default_visual" shared="true" needs_ref="1">
-        <return-type type="GdkVisual*"/>
+        <return-type type="GdkVisual*" />
       </method>
       <method name="GetDirection" cname="gtk_widget_get_direction">
-        <return-type type="GtkTextDirection"/>
+        <return-type type="GtkTextDirection" />
       </method>
       <method name="GetDisplay" cname="gtk_widget_get_display">
-        <return-type type="GdkDisplay*"/>
+        <return-type type="GdkDisplay*" />
       </method>
       <method name="GetEvents" cname="gtk_widget_get_events">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetExtensionEvents" cname="gtk_widget_get_extension_events">
-        <return-type type="GdkExtensionMode"/>
+        <return-type type="GdkExtensionMode" />
       </method>
       <method name="GetModifierStyle" cname="gtk_widget_get_modifier_style" needs_ref="1">
-        <return-type type="GtkRcStyle*"/>
+        <return-type type="GtkRcStyle*" />
       </method>
       <method name="GetName" cname="gtk_widget_get_name">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetPangoContext" cname="gtk_widget_get_pango_context">
-        <return-type type="PangoContext*"/>
+        <return-type type="PangoContext*" />
       </method>
       <method name="GetParent" cname="gtk_widget_get_parent">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetParentWindow" cname="gtk_widget_get_parent_window" needs_ref="1">
-        <return-type type="GdkWindow*"/>
+        <return-type type="GdkWindow*" />
       </method>
       <method name="GetPointer" cname="gtk_widget_get_pointer">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="x"/>
-          <parameter type="gint*" name="y"/>
+          <parameter type="gint*" name="x" />
+          <parameter type="gint*" name="y" />
         </parameters>
       </method>
       <method name="GetRootWindow" cname="gtk_widget_get_root_window">
-        <return-type type="GdkWindow*"/>
+        <return-type type="GdkWindow*" />
       </method>
       <method name="GetScreen" cname="gtk_widget_get_screen">
-        <return-type type="GdkScreen*"/>
+        <return-type type="GdkScreen*" />
       </method>
       <method name="GetSettings" cname="gtk_widget_get_settings">
-        <return-type type="GtkSettings*"/>
+        <return-type type="GtkSettings*" />
       </method>
       <method name="GetSizeRequest" cname="gtk_widget_get_size_request">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="GetStyle" cname="gtk_widget_get_style" needs_ref="1">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
       </method>
       <method name="GetToplevel" cname="gtk_widget_get_toplevel">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetType" cname="gtk_widget_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisual" cname="gtk_widget_get_visual" needs_ref="1">
-        <return-type type="GdkVisual*"/>
+        <return-type type="GdkVisual*" />
       </method>
       <method name="GrabDefault" cname="gtk_widget_grab_default">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GrabFocus" cname="gtk_widget_grab_focus">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="HasScreen" cname="gtk_widget_has_screen">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Hide" cname="gtk_widget_hide">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="HideAll" cname="gtk_widget_hide_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="HideOnDelete" cname="gtk_widget_hide_on_delete">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Intersect" cname="gtk_widget_intersect">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GdkRectangle*" name="intersection" pass_as="out"/>
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GdkRectangle*" name="intersection" pass_as="out" />
         </parameters>
       </method>
       <method name="IsAncestor" cname="gtk_widget_is_ancestor">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="ancestor"/>
+          <parameter type="GtkWidget*" name="ancestor" />
         </parameters>
       </method>
       <method name="GetIsFocus" cname="gtk_widget_is_focus">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ListAccelClosures" cname="gtk_widget_list_accel_closures" hidden="1">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="Map" cname="gtk_widget_map">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="MnemonicActivate" cname="gtk_widget_mnemonic_activate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="group_cycling"/>
+          <parameter type="gboolean" name="group_cycling" />
         </parameters>
       </method>
       <method name="ModifyBase" cname="gtk_widget_modify_base">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="ModifyBg" cname="gtk_widget_modify_bg">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="ModifyFg" cname="gtk_widget_modify_fg">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="ModifyFont" cname="gtk_widget_modify_font">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="PangoFontDescription*" name="font_desc"/>
+          <parameter type="PangoFontDescription*" name="font_desc" />
         </parameters>
       </method>
       <method name="ModifyStyle" cname="gtk_widget_modify_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRcStyle*" name="style"/>
+          <parameter type="GtkRcStyle*" name="style" />
         </parameters>
       </method>
       <method name="ModifyText" cname="gtk_widget_modify_text">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <constructor cname="gtk_widget_new">
         <parameters>
-          <parameter type="GType" name="type"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GType" name="type" />
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <method name="Path" cname="gtk_widget_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint*" name="path_length"/>
-          <parameter type="gchar**" name="path" pass_as="out"/>
-          <parameter type="gchar**" name="path_reversed" pass_as="out"/>
+          <parameter type="guint*" name="path_length" />
+          <parameter type="gchar**" name="path" pass_as="out" />
+          <parameter type="gchar**" name="path_reversed" pass_as="out" />
         </parameters>
       </method>
       <method name="PopColormap" cname="gtk_widget_pop_colormap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PopCompositeChild" cname="gtk_widget_pop_composite_child" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PushColormap" cname="gtk_widget_push_colormap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColormap*" name="cmap"/>
+          <parameter type="GdkColormap*" name="cmap" />
         </parameters>
       </method>
       <method name="PushCompositeChild" cname="gtk_widget_push_composite_child" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="QueueDraw" cname="gtk_widget_queue_draw">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="QueueDrawArea" cname="gtk_widget_queue_draw_area">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="QueueResize" cname="gtk_widget_queue_resize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Realize" cname="gtk_widget_realize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Ref" cname="gtk_widget_ref" hidden="1">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="RegionIntersect" cname="gtk_widget_region_intersect">
-        <return-type type="GdkRegion*"/>
+        <return-type type="GdkRegion*" />
         <parameters>
-          <parameter type="GdkRegion*" name="region"/>
+          <parameter type="GdkRegion*" name="region" />
         </parameters>
       </method>
       <method name="RemoveAccelerator" cname="gtk_widget_remove_accelerator">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
+          <parameter type="GtkAccelGroup*" name="accel_group" />
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
         </parameters>
       </method>
       <method name="RenderIcon" cname="gtk_widget_render_icon">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkIconSize" name="size"/>
-          <parameter type="const-gchar*" name="detail"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkIconSize" name="size" />
+          <parameter type="const-gchar*" name="detail" />
         </parameters>
       </method>
       <method name="Reparent" cname="gtk_widget_reparent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="new_parent"/>
+          <parameter type="GtkWidget*" name="new_parent" />
         </parameters>
       </method>
       <method name="ResetRcStyles" cname="gtk_widget_reset_rc_styles">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ResetShapes" cname="gtk_widget_reset_shapes">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SendExpose" cname="gtk_widget_send_expose">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="SetAccelPath" cname="gtk_widget_set_accel_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="const-gchar*" name="accel_path" />
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="SetAppPaintable" cname="gtk_widget_set_app_paintable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="app_paintable"/>
+          <parameter type="gboolean" name="app_paintable" />
         </parameters>
       </method>
       <method name="SetChildVisible" cname="gtk_widget_set_child_visible">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="is_visible"/>
+          <parameter type="gboolean" name="is_visible" />
         </parameters>
       </method>
       <method name="SetColormap" cname="gtk_widget_set_colormap">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColormap*" name="colormap"/>
+          <parameter type="GdkColormap*" name="colormap" />
         </parameters>
       </method>
       <method name="SetCompositeName" cname="gtk_widget_set_composite_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="SetDefaultColormap" cname="gtk_widget_set_default_colormap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkColormap*" name="colormap"/>
+          <parameter type="GdkColormap*" name="colormap" />
         </parameters>
       </method>
       <method name="SetDefaultDirection" cname="gtk_widget_set_default_direction" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextDirection" name="dir"/>
+          <parameter type="GtkTextDirection" name="dir" />
         </parameters>
       </method>
       <method name="SetDirection" cname="gtk_widget_set_direction">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextDirection" name="dir"/>
+          <parameter type="GtkTextDirection" name="dir" />
         </parameters>
       </method>
       <method name="SetDoubleBuffered" cname="gtk_widget_set_double_buffered">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="double_buffered"/>
+          <parameter type="gboolean" name="double_buffered" />
         </parameters>
       </method>
       <method name="SetEvents" cname="gtk_widget_set_events">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="events"/>
+          <parameter type="gint" name="events" />
         </parameters>
       </method>
       <method name="SetExtensionEvents" cname="gtk_widget_set_extension_events">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkExtensionMode" name="mode"/>
+          <parameter type="GdkExtensionMode" name="mode" />
         </parameters>
       </method>
       <method name="SetName" cname="gtk_widget_set_name">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="SetParent" cname="gtk_widget_set_parent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="parent"/>
+          <parameter type="GtkWidget*" name="parent" />
         </parameters>
       </method>
       <method name="SetParentWindow" cname="gtk_widget_set_parent_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindow*" name="parent_window"/>
+          <parameter type="GdkWindow*" name="parent_window" />
         </parameters>
       </method>
       <method name="SetRedrawOnAllocate" cname="gtk_widget_set_redraw_on_allocate">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="redraw_on_allocate"/>
+          <parameter type="gboolean" name="redraw_on_allocate" />
         </parameters>
       </method>
       <method name="SetScrollAdjustments" cname="gtk_widget_set_scroll_adjustments">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1"/>
-          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1"/>
+          <parameter type="GtkAdjustment*" name="hadjustment" null_ok="1" />
+          <parameter type="GtkAdjustment*" name="vadjustment" null_ok="1" />
         </parameters>
       </method>
       <method name="SetSensitive" cname="gtk_widget_set_sensitive">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="sensitive"/>
+          <parameter type="gboolean" name="sensitive" />
         </parameters>
       </method>
       <method name="SetSizeRequest" cname="gtk_widget_set_size_request">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="SetState" cname="gtk_widget_set_state">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
+          <parameter type="GtkStateType" name="state" />
         </parameters>
       </method>
       <method name="SetStyle" cname="gtk_widget_set_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style" null_ok="1"/>
+          <parameter type="GtkStyle*" name="style" null_ok="1" />
         </parameters>
       </method>
       <method name="ShapeCombineMask" cname="gtk_widget_shape_combine_mask">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkBitmap*" name="shape_mask"/>
-          <parameter type="gint" name="offset_x"/>
-          <parameter type="gint" name="offset_y"/>
+          <parameter type="GdkBitmap*" name="shape_mask" />
+          <parameter type="gint" name="offset_x" />
+          <parameter type="gint" name="offset_y" />
         </parameters>
       </method>
       <method name="Show" cname="gtk_widget_show">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ShowAll" cname="gtk_widget_show_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ShowNow" cname="gtk_widget_show_now">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SizeAllocate" cname="gtk_widget_size_allocate">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAllocation*" name="allocation"/>
+          <parameter type="GtkAllocation*" name="allocation" />
         </parameters>
       </method>
       <method name="SizeRequest" cname="gtk_widget_size_request">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkRequisition*" name="requisition" pass_as="ref"/>
+          <parameter type="GtkRequisition*" name="requisition" pass_as="ref" />
         </parameters>
       </method>
       <method name="StyleGet" cname="gtk_widget_style_get">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="StyleGetProperty" cname="gtk_widget_style_get_property">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="GValue*" name="value"/>
+          <parameter type="const-gchar*" name="property_name" />
+          <parameter type="GValue*" name="value" />
         </parameters>
       </method>
       <method name="StyleGetValist" cname="gtk_widget_style_get_valist">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="va_list" name="var_args"/>
+          <parameter type="const-gchar*" name="first_property_name" />
+          <parameter type="va_list" name="var_args" />
         </parameters>
       </method>
       <method name="ThawChildNotify" cname="gtk_widget_thaw_child_notify">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="TranslateCoordinates" cname="gtk_widget_translate_coordinates">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="dest_widget"/>
-          <parameter type="gint" name="src_x"/>
-          <parameter type="gint" name="src_y"/>
-          <parameter type="gint*" name="dest_x"/>
-          <parameter type="gint*" name="dest_y"/>
+          <parameter type="GtkWidget*" name="dest_widget" />
+          <parameter type="gint" name="src_x" />
+          <parameter type="gint" name="src_y" />
+          <parameter type="gint*" name="dest_x" />
+          <parameter type="gint*" name="dest_y" />
         </parameters>
       </method>
       <method name="Unmap" cname="gtk_widget_unmap">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unparent" cname="gtk_widget_unparent">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unrealize" cname="gtk_widget_unrealize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unref" cname="gtk_widget_unref" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="Window" cname="GtkWindow" parent="GtkBin">
-      <field cname="title" type="gchar*"/>
-      <field cname="wmclass_name" type="gchar*"/>
-      <field cname="wmclass_class" type="gchar*"/>
-      <field cname="wm_role" type="gchar*"/>
-      <field cname="focus_widget" type="GtkWidget*"/>
-      <field cname="default_widget" type="GtkWidget*"/>
-      <field cname="transient_parent" type="GtkWindow*"/>
-      <field cname="geometry_info" type="GtkWindowGeometryInfo*"/>
-      <field cname="frame" type="GdkWindow*"/>
-      <field cname="group" type="GtkWindowGroup*"/>
-      <field cname="configure_request_count" type="guint16"/>
-      <field cname="allow_shrink" bits="1" type="guint"/>
-      <field cname="allow_grow" bits="1" type="guint"/>
-      <field cname="configure_notify_received" bits="1" type="guint"/>
-      <field cname="need_default_position" bits="1" type="guint"/>
-      <field cname="need_default_size" bits="1" type="guint"/>
-      <field cname="position" bits="3" type="guint"/>
-      <field cname="type" bits="4" type="guint"/>
-      <field cname="has_user_ref_count" bits="1" type="guint"/>
-      <field cname="has_focus" bits="1" type="guint"/>
-      <field cname="modal" bits="1" type="guint"/>
-      <field cname="destroy_with_parent" bits="1" type="guint"/>
-      <field cname="has_frame" bits="1" type="guint"/>
-      <field cname="iconify_initially" bits="1" type="guint"/>
-      <field cname="stick_initially" bits="1" type="guint"/>
-      <field cname="maximize_initially" bits="1" type="guint"/>
-      <field cname="decorated" bits="1" type="guint"/>
-      <field cname="type_hint" bits="3" type="guint"/>
-      <field cname="gravity" bits="5" type="guint"/>
-      <field cname="is_active" bits="1" type="guint"/>
-      <field cname="has_toplevel_focus" bits="1" type="guint"/>
-      <field cname="frame_left" type="guint"/>
-      <field cname="frame_top" type="guint"/>
-      <field cname="frame_right" type="guint"/>
-      <field cname="frame_bottom" type="guint"/>
-      <field cname="keys_changed_handler" type="guint"/>
-      <field cname="mnemonic_modifier" type="GdkModifierType"/>
-      <field cname="screen" type="GdkScreen*"/>
-      <property name="Type" cname="type" type="GtkWindowType" readable="true" writeable="true" construct-only="true"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="AllowShrink" cname="allow_shrink" type="gboolean" readable="true" writeable="true"/>
-      <property name="AllowGrow" cname="allow_grow" type="gboolean" readable="true" writeable="true"/>
-      <property name="Resizable" cname="resizable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Modal" cname="modal" type="gboolean" readable="true" writeable="true"/>
-      <property name="WindowPosition" cname="window_position" type="GtkWindowPosition" readable="true" writeable="true"/>
-      <property name="DefaultWidth" cname="default_width" type="gint" readable="true" writeable="true"/>
-      <property name="DefaultHeight" cname="default_height" type="gint" readable="true" writeable="true"/>
-      <property name="DestroyWithParent" cname="destroy_with_parent" type="gboolean" readable="true" writeable="true"/>
-      <property name="Icon" cname="icon" type="GdkPixbuf" readable="true" writeable="true"/>
-      <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" new_flag="1"/>
-      <property name="IsActive" cname="is_active" type="gboolean" readable="true"/>
-      <property name="HasToplevelFocus" cname="has_toplevel_focus" type="gboolean" readable="true"/>
-      <property name="TypeHint" cname="type_hint" type="GdkWindowTypeHint" readable="true" writeable="true"/>
-      <property name="SkipTaskbarHint" cname="skip_taskbar_hint" type="gboolean" readable="true" writeable="true"/>
-      <property name="SkipPagerHint" cname="skip_pager_hint" type="gboolean" readable="true" writeable="true"/>
+      <field cname="title" type="gchar*" />
+      <field cname="wmclass_name" type="gchar*" />
+      <field cname="wmclass_class" type="gchar*" />
+      <field cname="wm_role" type="gchar*" />
+      <field cname="focus_widget" type="GtkWidget*" />
+      <field cname="default_widget" type="GtkWidget*" />
+      <field cname="transient_parent" type="GtkWindow*" />
+      <field cname="geometry_info" type="GtkWindowGeometryInfo*" />
+      <field cname="frame" type="GdkWindow*" />
+      <field cname="group" type="GtkWindowGroup*" />
+      <field cname="configure_request_count" type="guint16" />
+      <field cname="allow_shrink" bits="1" type="guint" />
+      <field cname="allow_grow" bits="1" type="guint" />
+      <field cname="configure_notify_received" bits="1" type="guint" />
+      <field cname="need_default_position" bits="1" type="guint" />
+      <field cname="need_default_size" bits="1" type="guint" />
+      <field cname="position" bits="3" type="guint" />
+      <field cname="type" bits="4" type="guint" />
+      <field cname="has_user_ref_count" bits="1" type="guint" />
+      <field cname="has_focus" bits="1" type="guint" />
+      <field cname="modal" bits="1" type="guint" />
+      <field cname="destroy_with_parent" bits="1" type="guint" />
+      <field cname="has_frame" bits="1" type="guint" />
+      <field cname="iconify_initially" bits="1" type="guint" />
+      <field cname="stick_initially" bits="1" type="guint" />
+      <field cname="maximize_initially" bits="1" type="guint" />
+      <field cname="decorated" bits="1" type="guint" />
+      <field cname="type_hint" bits="3" type="guint" />
+      <field cname="gravity" bits="5" type="guint" />
+      <field cname="is_active" bits="1" type="guint" />
+      <field cname="has_toplevel_focus" bits="1" type="guint" />
+      <field cname="frame_left" type="guint" />
+      <field cname="frame_top" type="guint" />
+      <field cname="frame_right" type="guint" />
+      <field cname="frame_bottom" type="guint" />
+      <field cname="keys_changed_handler" type="guint" />
+      <field cname="mnemonic_modifier" type="GdkModifierType" />
+      <field cname="screen" type="GdkScreen*" />
+      <property name="Type" cname="type" type="GtkWindowType" readable="true" writeable="true" construct-only="true" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="AllowShrink" cname="allow_shrink" type="gboolean" readable="true" writeable="true" />
+      <property name="AllowGrow" cname="allow_grow" type="gboolean" readable="true" writeable="true" />
+      <property name="Resizable" cname="resizable" type="gboolean" readable="true" writeable="true" />
+      <property name="Modal" cname="modal" type="gboolean" readable="true" writeable="true" />
+      <property name="WindowPosition" cname="window_position" type="GtkWindowPosition" readable="true" writeable="true" />
+      <property name="DefaultWidth" cname="default_width" type="gint" readable="true" writeable="true" />
+      <property name="DefaultHeight" cname="default_height" type="gint" readable="true" writeable="true" />
+      <property name="DestroyWithParent" cname="destroy_with_parent" type="gboolean" readable="true" writeable="true" />
+      <property name="Icon" cname="icon" type="GdkPixbuf" readable="true" writeable="true" />
+      <property name="Screen" cname="screen" type="GdkScreen" readable="true" writeable="true" new_flag="1" />
+      <property name="IsActive" cname="is_active" type="gboolean" readable="true" />
+      <property name="HasToplevelFocus" cname="has_toplevel_focus" type="gboolean" readable="true" />
+      <property name="TypeHint" cname="type_hint" type="GdkWindowTypeHint" readable="true" writeable="true" />
+      <property name="SkipTaskbarHint" cname="skip_taskbar_hint" type="gboolean" readable="true" writeable="true" />
+      <property name="SkipPagerHint" cname="skip_pager_hint" type="gboolean" readable="true" writeable="true" />
       <signal name="SetFocus" cname="set_focus" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="GtkWidget*" name="focus"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="GtkWidget*" name="focus" />
         </parameters>
       </signal>
       <signal name="FrameEvent" cname="frame_event" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
       <signal name="FocusActivated" cname="activate_focus" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
       <signal name="DefaultActivated" cname="activate_default" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
       <signal name="MoveFocus" cname="move_focus" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="GtkDirectionType" name="direction"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
       <signal name="KeysChanged" cname="keys_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
       <method name="ActivateDefault" cname="gtk_window_activate_default">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ActivateFocus" cname="gtk_window_activate_focus">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="AddAccelGroup" cname="gtk_window_add_accel_group">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="AddEmbeddedXid" cname="gtk_window_add_embedded_xid">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="xid"/>
+          <parameter type="guint" name="xid" />
         </parameters>
       </method>
       <method name="AddMnemonic" cname="gtk_window_add_mnemonic">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GtkWidget*" name="target"/>
+          <parameter type="guint" name="keyval" />
+          <parameter type="GtkWidget*" name="target" />
         </parameters>
       </method>
       <method name="BeginMoveDrag" cname="gtk_window_begin_move_drag">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="button"/>
-          <parameter type="gint" name="root_x"/>
-          <parameter type="gint" name="root_y"/>
-          <parameter type="guint32" name="timestamp"/>
+          <parameter type="gint" name="button" />
+          <parameter type="gint" name="root_x" />
+          <parameter type="gint" name="root_y" />
+          <parameter type="guint32" name="timestamp" />
         </parameters>
       </method>
       <method name="BeginResizeDrag" cname="gtk_window_begin_resize_drag">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindowEdge" name="edge"/>
-          <parameter type="gint" name="button"/>
-          <parameter type="gint" name="root_x"/>
-          <parameter type="gint" name="root_y"/>
-          <parameter type="guint32" name="timestamp"/>
+          <parameter type="GdkWindowEdge" name="edge" />
+          <parameter type="gint" name="button" />
+          <parameter type="gint" name="root_x" />
+          <parameter type="gint" name="root_y" />
+          <parameter type="guint32" name="timestamp" />
         </parameters>
       </method>
       <method name="Deiconify" cname="gtk_window_deiconify">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Fullscreen" cname="gtk_window_fullscreen">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetDecorated" cname="gtk_window_get_decorated">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetDefaultIconList" cname="gtk_window_get_default_icon_list" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="GetDefaultSize" cname="gtk_window_get_default_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="width" pass_as="out"/>
-          <parameter type="gint*" name="height" pass_as="out"/>
+          <parameter type="gint*" name="width" pass_as="out" />
+          <parameter type="gint*" name="height" pass_as="out" />
         </parameters>
       </method>
       <method name="GetDestroyWithParent" cname="gtk_window_get_destroy_with_parent">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetFocus" cname="gtk_window_get_focus">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="GetFrameDimensions" cname="gtk_window_get_frame_dimensions">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="left"/>
-          <parameter type="gint*" name="top"/>
-          <parameter type="gint*" name="right"/>
-          <parameter type="gint*" name="bottom"/>
+          <parameter type="gint*" name="left" />
+          <parameter type="gint*" name="top" />
+          <parameter type="gint*" name="right" />
+          <parameter type="gint*" name="bottom" />
         </parameters>
       </method>
       <method name="GetGravity" cname="gtk_window_get_gravity">
-        <return-type type="GdkGravity"/>
+        <return-type type="GdkGravity" />
       </method>
       <method name="GetHasFrame" cname="gtk_window_get_has_frame">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetIcon" cname="gtk_window_get_icon">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
       </method>
       <method name="GetIconList" cname="gtk_window_get_icon_list">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="GetMnemonicModifier" cname="gtk_window_get_mnemonic_modifier">
-        <return-type type="GdkModifierType"/>
+        <return-type type="GdkModifierType" />
       </method>
       <method name="GetModal" cname="gtk_window_get_modal">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetPosition" cname="gtk_window_get_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="root_x" pass_as="out"/>
-          <parameter type="gint*" name="root_y" pass_as="out"/>
+          <parameter type="gint*" name="root_x" pass_as="out" />
+          <parameter type="gint*" name="root_y" pass_as="out" />
         </parameters>
       </method>
       <method name="GetResizable" cname="gtk_window_get_resizable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetRole" cname="gtk_window_get_role">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetScreen" cname="gtk_window_get_screen">
-        <return-type type="GdkScreen*"/>
+        <return-type type="GdkScreen*" />
       </method>
       <method name="GetSize" cname="gtk_window_get_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint*" name="width" pass_as="out"/>
-          <parameter type="gint*" name="height" pass_as="out"/>
+          <parameter type="gint*" name="width" pass_as="out" />
+          <parameter type="gint*" name="height" pass_as="out" />
         </parameters>
       </method>
       <method name="GetSkipPagerHint" cname="gtk_window_get_skip_pager_hint">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetSkipTaskbarHint" cname="gtk_window_get_skip_taskbar_hint">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetTitle" cname="gtk_window_get_title">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetTransientFor" cname="gtk_window_get_transient_for">
-        <return-type type="GtkWindow*"/>
+        <return-type type="GtkWindow*" />
       </method>
       <method name="GetType" cname="gtk_window_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetTypeHint" cname="gtk_window_get_type_hint">
-        <return-type type="GdkWindowTypeHint"/>
+        <return-type type="GdkWindowTypeHint" />
       </method>
       <method name="Iconify" cname="gtk_window_iconify">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ListToplevels" cname="gtk_window_list_toplevels" shared="true">
-        <return-type type="GList*"/>
+        <return-type type="GList*" />
       </method>
       <method name="Maximize" cname="gtk_window_maximize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="MnemonicActivate" cname="gtk_window_mnemonic_activate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifier"/>
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifier" />
         </parameters>
       </method>
       <method name="Move" cname="gtk_window_move">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <constructor cname="gtk_window_new">
         <parameters>
-          <parameter type="GtkWindowType" name="type"/>
+          <parameter type="GtkWindowType" name="type" />
         </parameters>
       </constructor>
       <method name="ParseGeometry" cname="gtk_window_parse_geometry">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="geometry"/>
+          <parameter type="const-gchar*" name="geometry" />
         </parameters>
       </method>
       <method name="Present" cname="gtk_window_present">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="RemoveAccelGroup" cname="gtk_window_remove_accel_group">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="GtkAccelGroup*" name="accel_group" />
         </parameters>
       </method>
       <method name="RemoveEmbeddedXid" cname="gtk_window_remove_embedded_xid">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="xid"/>
+          <parameter type="guint" name="xid" />
         </parameters>
       </method>
       <method name="RemoveMnemonic" cname="gtk_window_remove_mnemonic">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GtkWidget*" name="target"/>
+          <parameter type="guint" name="keyval" />
+          <parameter type="GtkWidget*" name="target" />
         </parameters>
       </method>
       <method name="ReshowWithInitialSize" cname="gtk_window_reshow_with_initial_size">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Resize" cname="gtk_window_resize">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="SetAutoStartupNotification" cname="gtk_window_set_auto_startup_notification" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetDecorated" cname="gtk_window_set_decorated">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetDefault" cname="gtk_window_set_default">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="default_widget"/>
+          <parameter type="GtkWidget*" name="default_widget" />
         </parameters>
       </method>
       <method name="SetDefaultIconFromFile" cname="gtk_window_set_default_icon_from_file" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
-          <parameter type="GError**" name="err"/>
+          <parameter type="const-gchar*" name="filename" />
+          <parameter type="GError**" name="err" />
         </parameters>
       </method>
       <method name="SetDefaultIconList" cname="gtk_window_set_default_icon_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="list"/>
+          <parameter type="GList*" name="list" />
         </parameters>
       </method>
       <method name="SetDefaultSize" cname="gtk_window_set_default_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="SetDestroyWithParent" cname="gtk_window_set_destroy_with_parent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetFocus" cname="gtk_window_set_focus">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="focus"/>
+          <parameter type="GtkWidget*" name="focus" />
         </parameters>
       </method>
       <method name="SetFrameDimensions" cname="gtk_window_set_frame_dimensions">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="left"/>
-          <parameter type="gint" name="top"/>
-          <parameter type="gint" name="right"/>
-          <parameter type="gint" name="bottom"/>
+          <parameter type="gint" name="left" />
+          <parameter type="gint" name="top" />
+          <parameter type="gint" name="right" />
+          <parameter type="gint" name="bottom" />
         </parameters>
       </method>
       <method name="SetGeometryHints" cname="gtk_window_set_geometry_hints">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="geometry_widget"/>
-          <parameter type="GdkGeometry*" name="geometry"/>
-          <parameter type="GdkWindowHints" name="geom_mask"/>
+          <parameter type="GtkWidget*" name="geometry_widget" />
+          <parameter type="GdkGeometry*" name="geometry" />
+          <parameter type="GdkWindowHints" name="geom_mask" />
         </parameters>
       </method>
       <method name="SetGravity" cname="gtk_window_set_gravity">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkGravity" name="gravity"/>
+          <parameter type="GdkGravity" name="gravity" />
         </parameters>
       </method>
       <method name="SetHasFrame" cname="gtk_window_set_has_frame">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetIcon" cname="gtk_window_set_icon">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="icon"/>
+          <parameter type="GdkPixbuf*" name="icon" />
         </parameters>
       </method>
       <method name="SetIconFromFile" cname="gtk_window_set_icon_from_file">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
-          <parameter type="GError**" name="err"/>
+          <parameter type="const-gchar*" name="filename" />
+          <parameter type="GError**" name="err" />
         </parameters>
       </method>
       <method name="SetIconList" cname="gtk_window_set_icon_list">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GList*" name="list"/>
+          <parameter type="GList*" name="list" />
         </parameters>
       </method>
       <method name="SetMnemonicModifier" cname="gtk_window_set_mnemonic_modifier">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkModifierType" name="modifier"/>
+          <parameter type="GdkModifierType" name="modifier" />
         </parameters>
       </method>
       <method name="SetModal" cname="gtk_window_set_modal">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="modal"/>
+          <parameter type="gboolean" name="modal" />
         </parameters>
       </method>
       <method name="SetPosition" cname="gtk_window_set_position">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindowPosition" name="position"/>
+          <parameter type="GtkWindowPosition" name="position" />
         </parameters>
       </method>
       <method name="SetResizable" cname="gtk_window_set_resizable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="resizable"/>
+          <parameter type="gboolean" name="resizable" />
         </parameters>
       </method>
       <method name="SetRole" cname="gtk_window_set_role">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="role"/>
+          <parameter type="const-gchar*" name="role" />
         </parameters>
       </method>
       <method name="SetScreen" cname="gtk_window_set_screen">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkScreen*" name="screen"/>
+          <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </method>
       <method name="SetSkipPagerHint" cname="gtk_window_set_skip_pager_hint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetSkipTaskbarHint" cname="gtk_window_set_skip_taskbar_hint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gtk_window_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
       <method name="SetTransientFor" cname="gtk_window_set_transient_for">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="parent"/>
+          <parameter type="GtkWindow*" name="parent" />
         </parameters>
       </method>
       <method name="SetTypeHint" cname="gtk_window_set_type_hint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkWindowTypeHint" name="hint"/>
+          <parameter type="GdkWindowTypeHint" name="hint" />
         </parameters>
       </method>
       <method name="SetWmclass" cname="gtk_window_set_wmclass">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="wmclass_name"/>
-          <parameter type="const-gchar*" name="wmclass_class"/>
+          <parameter type="const-gchar*" name="wmclass_name" />
+          <parameter type="const-gchar*" name="wmclass_class" />
         </parameters>
       </method>
       <method name="Stick" cname="gtk_window_stick">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unfullscreen" cname="gtk_window_unfullscreen">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unmaximize" cname="gtk_window_unmaximize">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unstick" cname="gtk_window_unstick">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
     <object name="WindowGroup" cname="GtkWindowGroup" parent="GObject">
-      <field cname="grabs" type="GSList*"/>
+      <field cname="grabs" type="GSList*" />
       <method name="AddWindow" cname="gtk_window_group_add_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_window_group_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_window_group_new"/>
+      <constructor cname="gtk_window_group_new" />
       <method name="RemoveWindow" cname="gtk_window_group_remove_window">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </method>
     </object>
     <struct name="AccelGroupEntry" cname="GtkAccelGroupEntry">
-      <field cname="key" type="GtkAccelKey"/>
-      <field cname="closure" type="GClosure*"/>
-      <field cname="accel_path_quark" type="GQuark"/>
+      <field cname="key" type="GtkAccelKey" />
+      <field cname="closure" type="GClosure*" />
+      <field cname="accel_path_quark" type="GQuark" />
     </struct>
     <struct name="AccelKey" cname="GtkAccelKey">
-      <field cname="accel_key" type="guint"/>
-      <field cname="accel_mods" type="GdkModifierType"/>
-      <field cname="accel_flags" bits="16" type="guint"/>
+      <field cname="accel_key" type="guint" />
+      <field cname="accel_mods" type="GdkModifierType" />
+      <field cname="accel_flags" bits="16" type="guint" />
     </struct>
-    <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle"/>
+    <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle" />
     <struct name="Arg" cname="GtkArg" opaque="true">
       <method name="FlagsGetType" cname="gtk_arg_flags_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </struct>
     <struct name="BindingArg" cname="GtkBindingArg" hidden="1">
-      <field cname="arg_type" type="GType"/>
-      <field cname="long_data" type="glong"/>
+      <field cname="arg_type" type="GType" />
+      <field cname="long_data" type="glong" />
     </struct>
     <struct name="BindingEntry" cname="GtkBindingEntry" hidden="1">
-      <field cname="keyval" type="guint"/>
-      <field cname="modifiers" type="GdkModifierType"/>
-      <field cname="binding_set" type="GtkBindingSet*"/>
-      <field cname="destroyed" bits="1" type="guint"/>
-      <field cname="in_emission" bits="1" type="guint"/>
-      <field cname="set_next" type="GtkBindingEntry*"/>
-      <field cname="hash_next" type="GtkBindingEntry*"/>
-      <field cname="signals" type="GtkBindingSignal*"/>
+      <field cname="keyval" type="guint" />
+      <field cname="modifiers" type="GdkModifierType" />
+      <field cname="binding_set" type="GtkBindingSet*" />
+      <field cname="destroyed" bits="1" type="guint" />
+      <field cname="in_emission" bits="1" type="guint" />
+      <field cname="set_next" type="GtkBindingEntry*" />
+      <field cname="hash_next" type="GtkBindingEntry*" />
+      <field cname="signals" type="GtkBindingSignal*" />
       <method name="AddSignal" cname="gtk_binding_entry_add_signal" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkBindingSet*" name="binding_set"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
-          <parameter type="const-gchar*" name="signal_name"/>
-          <parameter type="guint" name="n_args"/>
-          <parameter ellipsis="true"/>
+          <parameter type="GtkBindingSet*" name="binding_set" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
+          <parameter type="const-gchar*" name="signal_name" />
+          <parameter type="guint" name="n_args" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="AddSignall" cname="gtk_binding_entry_add_signall" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkBindingSet*" name="binding_set"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
-          <parameter type="const-gchar*" name="signal_name"/>
-          <parameter type="GSList*" name="binding_args"/>
+          <parameter type="GtkBindingSet*" name="binding_set" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
+          <parameter type="const-gchar*" name="signal_name" />
+          <parameter type="GSList*" name="binding_args" />
         </parameters>
       </method>
       <method name="Clear" cname="gtk_binding_entry_clear" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkBindingSet*" name="binding_set"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
+          <parameter type="GtkBindingSet*" name="binding_set" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_binding_entry_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkBindingSet*" name="binding_set"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
+          <parameter type="GtkBindingSet*" name="binding_set" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
         </parameters>
       </method>
     </struct>
     <struct name="BindingSet" cname="GtkBindingSet" hidden="1">
-      <field cname="set_name" type="gchar*"/>
-      <field cname="priority" type="gint"/>
-      <field cname="widget_path_pspecs" type="GSList*"/>
-      <field cname="widget_class_pspecs" type="GSList*"/>
-      <field cname="class_branch_pspecs" type="GSList*"/>
-      <field cname="entries" type="GtkBindingEntry*"/>
-      <field cname="current" type="GtkBindingEntry*"/>
-      <field cname="parsed" bits="1" type="guint"/>
+      <field cname="set_name" type="gchar*" />
+      <field cname="priority" type="gint" />
+      <field cname="widget_path_pspecs" type="GSList*" />
+      <field cname="widget_class_pspecs" type="GSList*" />
+      <field cname="class_branch_pspecs" type="GSList*" />
+      <field cname="entries" type="GtkBindingEntry*" />
+      <field cname="current" type="GtkBindingEntry*" />
+      <field cname="parsed" bits="1" type="guint" />
       <method name="Activate" cname="gtk_binding_set_activate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
-          <parameter type="GtkObject*" name="object"/>
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
+          <parameter type="GtkObject*" name="object" />
         </parameters>
       </method>
       <method name="AddPath" cname="gtk_binding_set_add_path">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkPathType" name="path_type"/>
-          <parameter type="const-gchar*" name="path_pattern"/>
-          <parameter type="GtkPathPriorityType" name="priority"/>
+          <parameter type="GtkPathType" name="path_type" />
+          <parameter type="const-gchar*" name="path_pattern" />
+          <parameter type="GtkPathPriorityType" name="priority" />
         </parameters>
       </method>
       <method name="ByClass" cname="gtk_binding_set_by_class" shared="true">
-        <return-type type="GtkBindingSet*"/>
+        <return-type type="GtkBindingSet*" />
         <parameters>
-          <parameter type="gpointer" name="object_class"/>
+          <parameter type="gpointer" name="object_class" />
         </parameters>
       </method>
       <method name="Find" cname="gtk_binding_set_find" shared="true">
-        <return-type type="GtkBindingSet*"/>
+        <return-type type="GtkBindingSet*" />
         <parameters>
-          <parameter type="const-gchar*" name="set_name"/>
+          <parameter type="const-gchar*" name="set_name" />
         </parameters>
       </method>
       <constructor cname="gtk_binding_set_new">
         <parameters>
-          <parameter type="const-gchar*" name="set_name"/>
+          <parameter type="const-gchar*" name="set_name" />
         </parameters>
       </constructor>
     </struct>
     <struct name="BindingSignal" cname="GtkBindingSignal" hidden="1">
-      <field cname="next" type="GtkBindingSignal*"/>
-      <field cname="signal_name" type="gchar*"/>
-      <field cname="n_args" type="guint"/>
-      <field cname="args" type="GtkBindingArg*"/>
+      <field cname="next" type="GtkBindingSignal*" />
+      <field cname="signal_name" type="gchar*" />
+      <field cname="n_args" type="guint" />
+      <field cname="args" type="GtkBindingArg*" />
     </struct>
     <boxed name="Border" cname="GtkBorder" hidden="1">
-      <field cname="left" type="gint"/>
-      <field cname="right" type="gint"/>
-      <field cname="top" type="gint"/>
-      <field cname="bottom" type="gint"/>
+      <field cname="left" type="gint" />
+      <field cname="right" type="gint" />
+      <field cname="top" type="gint" />
+      <field cname="bottom" type="gint" />
       <method name="Copy" cname="gtk_border_copy">
-        <return-type type="GtkBorder*"/>
+        <return-type type="GtkBorder*" />
       </method>
       <method name="Free" cname="gtk_border_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_border_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </boxed>
     <struct name="BoxChild" cname="GtkBoxChild" hidden="1">
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="padding" type="guint16"/>
-      <field cname="expand" bits="1" type="guint"/>
-      <field cname="fill" bits="1" type="guint"/>
-      <field cname="pack" bits="1" type="guint"/>
-      <field cname="is_secondary" bits="1" type="guint"/>
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="padding" type="guint16" />
+      <field cname="expand" bits="1" type="guint" />
+      <field cname="fill" bits="1" type="guint" />
+      <field cname="pack" bits="1" type="guint" />
+      <field cname="is_secondary" bits="1" type="guint" />
     </struct>
     <struct name="FixedChild" cname="GtkFixedChild" hidden="1">
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="x" type="gint"/>
-      <field cname="y" type="gint"/>
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="x" type="gint" />
+      <field cname="y" type="gint" />
     </struct>
     <struct name="IMContextInfo" cname="GtkIMContextInfo">
-      <field cname="context_id" type="const-gchar*"/>
-      <field cname="context_name" type="const-gchar*"/>
-      <field cname="domain" type="const-gchar*"/>
-      <field cname="domain_dirname" type="const-gchar*"/>
-      <field cname="default_locales" type="const-gchar*"/>
+      <field cname="context_id" type="const-gchar*" />
+      <field cname="context_name" type="const-gchar*" />
+      <field cname="domain" type="const-gchar*" />
+      <field cname="domain_dirname" type="const-gchar*" />
+      <field cname="default_locales" type="const-gchar*" />
     </struct>
     <boxed name="IconSet" cname="GtkIconSet" opaque="true">
       <method name="AddSource" cname="gtk_icon_set_add_source">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkIconSource*" name="source"/>
+          <parameter type="const-GtkIconSource*" name="source" />
         </parameters>
       </method>
       <method name="Copy" cname="gtk_icon_set_copy">
-        <return-type type="GtkIconSet*"/>
+        <return-type type="GtkIconSet*" />
       </method>
       <method name="GetSizes" cname="gtk_icon_set_get_sizes" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSize**" name="sizes"/>
-          <parameter type="gint*" name="n_sizes"/>
+          <parameter type="GtkIconSize**" name="sizes" />
+          <parameter type="gint*" name="n_sizes" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_icon_set_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_icon_set_new"/>
+      <constructor cname="gtk_icon_set_new" />
       <constructor cname="gtk_icon_set_new_from_pixbuf">
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </constructor>
       <method name="Ref" cname="gtk_icon_set_ref">
-        <return-type type="GtkIconSet*"/>
+        <return-type type="GtkIconSet*" />
       </method>
       <method name="RenderIcon" cname="gtk_icon_set_render_icon">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GtkTextDirection" name="direction"/>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GtkIconSize" name="size"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="detail"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GtkTextDirection" name="direction" />
+          <parameter type="GtkStateType" name="state" />
+          <parameter type="GtkIconSize" name="size" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-char*" name="detail" />
         </parameters>
       </method>
       <method name="Unref" cname="gtk_icon_set_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </boxed>
     <boxed name="IconSource" cname="GtkIconSource" opaque="true">
       <method name="Copy" cname="gtk_icon_source_copy">
-        <return-type type="GtkIconSource*"/>
+        <return-type type="GtkIconSource*" />
       </method>
       <method name="Free" cname="gtk_icon_source_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetDirection" cname="gtk_icon_source_get_direction">
-        <return-type type="GtkTextDirection"/>
+        <return-type type="GtkTextDirection" />
       </method>
       <method name="GetDirectionWildcarded" cname="gtk_icon_source_get_direction_wildcarded">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetFilename" cname="gtk_icon_source_get_filename">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetPixbuf" cname="gtk_icon_source_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
       </method>
       <method name="GetSize" cname="gtk_icon_source_get_size">
-        <return-type type="GtkIconSize"/>
+        <return-type type="GtkIconSize" />
       </method>
       <method name="GetSizeWildcarded" cname="gtk_icon_source_get_size_wildcarded">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetState" cname="gtk_icon_source_get_state">
-        <return-type type="GtkStateType"/>
+        <return-type type="GtkStateType" />
       </method>
       <method name="GetStateWildcarded" cname="gtk_icon_source_get_state_wildcarded">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetType" cname="gtk_icon_source_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_icon_source_new"/>
+      <constructor cname="gtk_icon_source_new" />
       <method name="SetDirection" cname="gtk_icon_source_set_direction">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextDirection" name="direction"/>
+          <parameter type="GtkTextDirection" name="direction" />
         </parameters>
       </method>
       <method name="SetDirectionWildcarded" cname="gtk_icon_source_set_direction_wildcarded">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetFilename" cname="gtk_icon_source_set_filename">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="SetPixbuf" cname="gtk_icon_source_set_pixbuf">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </method>
       <method name="SetSize" cname="gtk_icon_source_set_size">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </method>
       <method name="SetSizeWildcarded" cname="gtk_icon_source_set_size_wildcarded">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
       <method name="SetState" cname="gtk_icon_source_set_state">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStateType" name="state"/>
+          <parameter type="GtkStateType" name="state" />
         </parameters>
       </method>
       <method name="SetStateWildcarded" cname="gtk_icon_source_set_state_wildcarded">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="setting"/>
+          <parameter type="gboolean" name="setting" />
         </parameters>
       </method>
     </boxed>
     <struct name="ImageAnimationData" cname="GtkImageAnimationData">
-      <field cname="anim" type="GdkPixbufAnimation*"/>
-      <field cname="iter" type="GdkPixbufAnimationIter*"/>
-      <field cname="frame_timeout" type="guint"/>
+      <field cname="anim" type="GdkPixbufAnimation*" />
+      <field cname="iter" type="GdkPixbufAnimationIter*" />
+      <field cname="frame_timeout" type="guint" />
     </struct>
     <struct name="ImageIconSetData" cname="GtkImageIconSetData">
-      <field cname="icon_set" type="GtkIconSet*"/>
+      <field cname="icon_set" type="GtkIconSet*" />
     </struct>
     <struct name="ImageImageData" cname="GtkImageImageData">
-      <field cname="image" type="GdkImage*"/>
+      <field cname="image" type="GdkImage*" />
     </struct>
     <struct name="ImagePixbufData" cname="GtkImagePixbufData">
-      <field cname="pixbuf" type="GdkPixbuf*"/>
+      <field cname="pixbuf" type="GdkPixbuf*" />
     </struct>
     <struct name="ImagePixmapData" cname="GtkImagePixmapData">
-      <field cname="pixmap" type="GdkPixmap*"/>
+      <field cname="pixmap" type="GdkPixmap*" />
     </struct>
     <struct name="ImageStockData" cname="GtkImageStockData">
-      <field cname="stock_id" type="gchar*"/>
+      <field cname="stock_id" type="gchar*" />
     </struct>
     <struct name="ItemFactoryEntry" cname="GtkItemFactoryEntry">
-      <field cname="path" type="gchar*"/>
-      <field cname="accelerator" type="gchar*"/>
-      <field cname="callback" type="GtkItemFactoryCallback"/>
-      <field cname="callback_action" type="guint"/>
-      <field cname="item_type" type="gchar*"/>
-      <field cname="extra_data" type="gconstpointer"/>
+      <field cname="path" type="gchar*" />
+      <field cname="accelerator" type="gchar*" />
+      <field cname="callback" type="GtkItemFactoryCallback" />
+      <field cname="callback_action" type="guint" />
+      <field cname="item_type" type="gchar*" />
+      <field cname="extra_data" type="gconstpointer" />
     </struct>
     <struct name="ItemFactoryItem" cname="GtkItemFactoryItem" hidden="1">
-      <field cname="path" type="gchar*"/>
-      <field cname="widgets" type="GSList*"/>
+      <field cname="path" type="gchar*" />
+      <field cname="widgets" type="GSList*" />
     </struct>
-    <struct name="KeyHash" cname="GtkKeyHash" opaque="true" hidden="1"/>
-    <struct name="LabelSelectionInfo" cname="GtkLabelSelectionInfo" opaque="true" hidden="1"/>
+    <struct name="KeyHash" cname="GtkKeyHash" opaque="true" hidden="1" />
+    <struct name="LabelSelectionInfo" cname="GtkLabelSelectionInfo" opaque="true" hidden="1" />
     <struct name="NotebookPage" cname="GtkNotebookPage" opaque="true">
       <method name="Num" cname="gtk_notebook_page_num" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkNotebook*" name="notebook"/>
-          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkNotebook*" name="notebook" />
+          <parameter type="GtkWidget*" name="child" />
         </parameters>
       </method>
     </struct>
     <struct name="Progress" cname="GtkProgress" hidden="1">
-      <field cname="widget" type="GtkWidget"/>
-      <field cname="adjustment" type="GtkAdjustment*"/>
-      <field cname="offscreen_pixmap" type="GdkPixmap*"/>
-      <field cname="format" type="gchar*"/>
-      <field cname="x_align" type="gfloat"/>
-      <field cname="y_align" type="gfloat"/>
-      <field cname="show_text" bits="1" type="guint"/>
-      <field cname="activity_mode" bits="1" type="guint"/>
-      <field cname="use_text_format" bits="1" type="guint"/>
+      <field cname="widget" type="GtkWidget" />
+      <field cname="adjustment" type="GtkAdjustment*" />
+      <field cname="offscreen_pixmap" type="GdkPixmap*" />
+      <field cname="format" type="gchar*" />
+      <field cname="x_align" type="gfloat" />
+      <field cname="y_align" type="gfloat" />
+      <field cname="show_text" bits="1" type="guint" />
+      <field cname="activity_mode" bits="1" type="guint" />
+      <field cname="use_text_format" bits="1" type="guint" />
     </struct>
     <struct name="ProgressClass" cname="GtkProgressClass" hidden="1">
-      <field cname="parent_class" type="GtkWidgetClass"/>
+      <field cname="parent_class" type="GtkWidgetClass" />
       <callback cname="paint">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkProgress*" name="progress"/>
+          <parameter type="GtkProgress*" name="progress" />
         </parameters>
       </callback>
       <callback cname="update">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkProgress*" name="progress"/>
+          <parameter type="GtkProgress*" name="progress" />
         </parameters>
       </callback>
       <callback cname="act_mode_enter">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkProgress*" name="progress"/>
+          <parameter type="GtkProgress*" name="progress" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved1"/>
+          <parameter type="void " name="_gtk_reserved1" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved2">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved2"/>
+          <parameter type="void " name="_gtk_reserved2" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved3">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved3"/>
+          <parameter type="void " name="_gtk_reserved3" />
         </parameters>
       </callback>
       <callback cname="_gtk_reserved4">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="void " name="_gtk_reserved4"/>
+          <parameter type="void " name="_gtk_reserved4" />
         </parameters>
       </callback>
     </struct>
     <struct name="RBNode" cname="GtkRBNode">
-      <field cname="flags" bits="14" type="guint"/>
-      <field cname="parity" bits="1" type="guint"/>
-      <field cname="left" type="GtkRBNode*"/>
-      <field cname="right" type="GtkRBNode*"/>
-      <field cname="parent" type="GtkRBNode*"/>
-      <field cname="count" type="gint"/>
-      <field cname="offset" type="gint"/>
-      <field cname="children" type="GtkRBTree*"/>
+      <field cname="flags" bits="14" type="guint" />
+      <field cname="parity" bits="1" type="guint" />
+      <field cname="left" type="GtkRBNode*" />
+      <field cname="right" type="GtkRBNode*" />
+      <field cname="parent" type="GtkRBNode*" />
+      <field cname="count" type="gint" />
+      <field cname="offset" type="gint" />
+      <field cname="children" type="GtkRBTree*" />
     </struct>
     <struct name="RBTree" cname="GtkRBTree">
-      <field cname="root" type="GtkRBNode*"/>
-      <field cname="nil" type="GtkRBNode*"/>
-      <field cname="parent_tree" type="GtkRBTree*"/>
-      <field cname="parent_node" type="GtkRBNode*"/>
+      <field cname="root" type="GtkRBNode*" />
+      <field cname="nil" type="GtkRBNode*" />
+      <field cname="parent_tree" type="GtkRBTree*" />
+      <field cname="parent_node" type="GtkRBNode*" />
     </struct>
-    <struct name="RBTreeView" cname="GtkRBTreeView" opaque="true"/>
-    <struct name="RangeLayout" cname="GtkRangeLayout" opaque="true" hidden="1"/>
-    <struct name="RangeStepTimer" cname="GtkRangeStepTimer" opaque="true" hidden="1"/>
-    <struct name="RcContext" cname="GtkRcContext" opaque="true" hidden="1"/>
+    <struct name="RBTreeView" cname="GtkRBTreeView" opaque="true" />
+    <struct name="RangeLayout" cname="GtkRangeLayout" opaque="true" hidden="1" />
+    <struct name="RangeStepTimer" cname="GtkRangeStepTimer" opaque="true" hidden="1" />
+    <struct name="RcContext" cname="GtkRcContext" opaque="true" hidden="1" />
     <struct name="RcProperty" cname="GtkRcProperty">
-      <field cname="type_name" type="GQuark"/>
-      <field cname="property_name" type="GQuark"/>
-      <field cname="origin" type="gchar*"/>
-      <field cname="value" type="GValue"/>
+      <field cname="type_name" type="GQuark" />
+      <field cname="property_name" type="GQuark" />
+      <field cname="origin" type="gchar*" />
+      <field cname="value" type="GValue" />
       <method name="ParseBorder" cname="gtk_rc_property_parse_border" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GParamSpec*" name="pspec"/>
-          <parameter type="const-GString*" name="gstring"/>
-          <parameter type="GValue*" name="property_value"/>
+          <parameter type="const-GParamSpec*" name="pspec" />
+          <parameter type="const-GString*" name="gstring" />
+          <parameter type="GValue*" name="property_value" />
         </parameters>
       </method>
       <method name="ParseColor" cname="gtk_rc_property_parse_color" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GParamSpec*" name="pspec"/>
-          <parameter type="const-GString*" name="gstring"/>
-          <parameter type="GValue*" name="property_value"/>
+          <parameter type="const-GParamSpec*" name="pspec" />
+          <parameter type="const-GString*" name="gstring" />
+          <parameter type="GValue*" name="property_value" />
         </parameters>
       </method>
       <method name="ParseEnum" cname="gtk_rc_property_parse_enum" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GParamSpec*" name="pspec"/>
-          <parameter type="const-GString*" name="gstring"/>
-          <parameter type="GValue*" name="property_value"/>
+          <parameter type="const-GParamSpec*" name="pspec" />
+          <parameter type="const-GString*" name="gstring" />
+          <parameter type="GValue*" name="property_value" />
         </parameters>
       </method>
       <method name="ParseFlags" cname="gtk_rc_property_parse_flags" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GParamSpec*" name="pspec"/>
-          <parameter type="const-GString*" name="gstring"/>
-          <parameter type="GValue*" name="property_value"/>
+          <parameter type="const-GParamSpec*" name="pspec" />
+          <parameter type="const-GString*" name="gstring" />
+          <parameter type="GValue*" name="property_value" />
         </parameters>
       </method>
       <method name="ParseRequisition" cname="gtk_rc_property_parse_requisition" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GParamSpec*" name="pspec"/>
-          <parameter type="const-GString*" name="gstring"/>
-          <parameter type="GValue*" name="property_value"/>
+          <parameter type="const-GParamSpec*" name="pspec" />
+          <parameter type="const-GString*" name="gstring" />
+          <parameter type="GValue*" name="property_value" />
         </parameters>
       </method>
     </struct>
     <boxed name="Requisition" cname="GtkRequisition">
-      <field cname="width" type="gint"/>
-      <field cname="height" type="gint"/>
+      <field cname="width" type="gint" />
+      <field cname="height" type="gint" />
       <method name="Copy" cname="gtk_requisition_copy">
-        <return-type type="GtkRequisition*"/>
+        <return-type type="GtkRequisition*" />
       </method>
       <method name="Free" cname="gtk_requisition_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_requisition_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </boxed>
     <struct name="RulerMetric" cname="GtkRulerMetric">
-      <field cname="metric_name" type="gchar*"/>
-      <field cname="abbrev" type="gchar*"/>
-      <field cname="pixels_per_unit" type="gdouble"/>
-      <field cname="ruler_scale" array_len="10" type="gdouble"/>
-      <field cname="subdivide" array_len="5" type="gint"/>
+      <field cname="metric_name" type="gchar*" />
+      <field cname="abbrev" type="gchar*" />
+      <field cname="pixels_per_unit" type="gdouble" />
+      <field cname="ruler_scale" array_len="10" type="gdouble" />
+      <field cname="subdivide" array_len="5" type="gint" />
     </struct>
     <boxed name="SelectionData" cname="GtkSelectionData">
-      <field cname="selection" type="GdkAtom"/>
-      <field cname="target" type="GdkAtom"/>
-      <field cname="type" type="GdkAtom"/>
-      <field cname="format" type="gint"/>
-      <field cname="data" type="guchar*"/>
-      <field cname="length" type="gint"/>
-      <field cname="display" type="GdkDisplay*"/>
+      <field cname="selection" type="GdkAtom" />
+      <field cname="target" type="GdkAtom" />
+      <field cname="type" type="GdkAtom" />
+      <field cname="format" type="gint" />
+      <field cname="data" type="guchar*" />
+      <field cname="length" type="gint" />
+      <field cname="display" type="GdkDisplay*" />
       <method name="Copy" cname="gtk_selection_data_copy">
-        <return-type type="GtkSelectionData*"/>
+        <return-type type="GtkSelectionData*" />
       </method>
       <method name="Free" cname="gtk_selection_data_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetTargets" cname="gtk_selection_data_get_targets">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkAtom**" name="targets"/>
-          <parameter type="gint*" name="n_atoms"/>
+          <parameter type="GdkAtom**" name="targets" />
+          <parameter type="gint*" name="n_atoms" />
         </parameters>
       </method>
       <method name="GetText" cname="gtk_selection_data_get_text" hidden="1">
-        <return-type type="guchar*"/>
+        <return-type type="guchar*" />
       </method>
       <method name="GetType" cname="gtk_selection_data_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Set" cname="gtk_selection_data_set" hidden="1">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkAtom" name="type"/>
-          <parameter type="gint" name="format"/>
-          <parameter type="const-guchar*" name="data"/>
-          <parameter type="gint" name="length"/>
+          <parameter type="GdkAtom" name="type" />
+          <parameter type="gint" name="format" />
+          <parameter type="const-guchar*" name="data" />
+          <parameter type="gint" name="length" />
         </parameters>
       </method>
       <method name="SetText" cname="gtk_selection_data_set_text" hidden="1">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
       <method name="TargetsIncludeText" cname="gtk_selection_data_targets_include_text">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
     </boxed>
-    <struct name="SettingsPropertyValue" cname="GtkSettingsPropertyValue" opaque="true"/>
+    <struct name="SettingsPropertyValue" cname="GtkSettingsPropertyValue" opaque="true" />
     <struct name="SettingsValue" cname="GtkSettingsValue">
-      <field cname="origin" type="gchar*"/>
-      <field cname="value" type="GValue"/>
+      <field cname="origin" type="gchar*" />
+      <field cname="value" type="GValue" />
     </struct>
     <struct name="StockItem" cname="GtkStockItem">
-      <field cname="stock_id" type="gchar*"/>
-      <field cname="label" type="gchar*"/>
-      <field cname="modifier" type="GdkModifierType"/>
-      <field cname="keyval" type="guint"/>
-      <field cname="translation_domain" type="gchar*"/>
+      <field cname="stock_id" type="gchar*" />
+      <field cname="label" type="gchar*" />
+      <field cname="modifier" type="GdkModifierType" />
+      <field cname="keyval" type="guint" />
+      <field cname="translation_domain" type="gchar*" />
       <method name="Copy" cname="gtk_stock_item_copy">
-        <return-type type="GtkStockItem*"/>
+        <return-type type="GtkStockItem*" />
       </method>
       <method name="Free" cname="gtk_stock_item_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <struct name="TableChild" cname="GtkTableChild" hidden="1">
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="left_attach" type="guint16"/>
-      <field cname="right_attach" type="guint16"/>
-      <field cname="top_attach" type="guint16"/>
-      <field cname="bottom_attach" type="guint16"/>
-      <field cname="xpadding" type="guint16"/>
-      <field cname="ypadding" type="guint16"/>
-      <field cname="xexpand" bits="1" type="guint"/>
-      <field cname="yexpand" bits="1" type="guint"/>
-      <field cname="xshrink" bits="1" type="guint"/>
-      <field cname="yshrink" bits="1" type="guint"/>
-      <field cname="xfill" bits="1" type="guint"/>
-      <field cname="yfill" bits="1" type="guint"/>
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="left_attach" type="guint16" />
+      <field cname="right_attach" type="guint16" />
+      <field cname="top_attach" type="guint16" />
+      <field cname="bottom_attach" type="guint16" />
+      <field cname="xpadding" type="guint16" />
+      <field cname="ypadding" type="guint16" />
+      <field cname="xexpand" bits="1" type="guint" />
+      <field cname="yexpand" bits="1" type="guint" />
+      <field cname="xshrink" bits="1" type="guint" />
+      <field cname="yshrink" bits="1" type="guint" />
+      <field cname="xfill" bits="1" type="guint" />
+      <field cname="yfill" bits="1" type="guint" />
     </struct>
     <struct name="TableRowCol" cname="GtkTableRowCol" hidden="1">
-      <field cname="requisition" type="guint16"/>
-      <field cname="allocation" type="guint16"/>
-      <field cname="spacing" type="guint16"/>
-      <field cname="need_expand" bits="1" type="guint"/>
-      <field cname="need_shrink" bits="1" type="guint"/>
-      <field cname="expand" bits="1" type="guint"/>
-      <field cname="shrink" bits="1" type="guint"/>
-      <field cname="empty" bits="1" type="guint"/>
+      <field cname="requisition" type="guint16" />
+      <field cname="allocation" type="guint16" />
+      <field cname="spacing" type="guint16" />
+      <field cname="need_expand" bits="1" type="guint" />
+      <field cname="need_shrink" bits="1" type="guint" />
+      <field cname="expand" bits="1" type="guint" />
+      <field cname="shrink" bits="1" type="guint" />
+      <field cname="empty" bits="1" type="guint" />
     </struct>
     <struct name="TargetEntry" cname="GtkTargetEntry">
-      <field cname="target" type="gchar*"/>
-      <field cname="flags" type="guint"/>
-      <field cname="info" type="guint"/>
+      <field cname="target" type="gchar*" />
+      <field cname="flags" type="guint" />
+      <field cname="info" type="guint" />
     </struct>
     <struct name="TargetList" cname="GtkTargetList">
-      <field cname="list" type="GList*"/>
-      <field cname="ref_count" type="guint"/>
+      <field cname="list" type="GList*" />
+      <field cname="ref_count" type="guint" />
       <method name="Add" cname="gtk_target_list_add">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="guint" name="flags"/>
-          <parameter type="guint" name="info"/>
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="guint" name="flags" />
+          <parameter type="guint" name="info" />
         </parameters>
       </method>
       <method name="AddTable" cname="gtk_target_list_add_table">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="ntargets"/>
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="guint" name="ntargets" />
         </parameters>
       </method>
       <method name="Find" cname="gtk_target_list_find">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="guint*" name="info"/>
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="guint*" name="info" />
         </parameters>
       </method>
       <constructor cname="gtk_target_list_new">
         <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="ntargets"/>
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="guint" name="ntargets" />
         </parameters>
       </constructor>
       <method name="Ref" cname="gtk_target_list_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Remove" cname="gtk_target_list_remove">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkAtom" name="target"/>
+          <parameter type="GdkAtom" name="target" />
         </parameters>
       </method>
       <method name="Unref" cname="gtk_target_list_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </struct>
     <struct name="TargetPair" cname="GtkTargetPair">
-      <field cname="target" type="GdkAtom"/>
-      <field cname="flags" type="guint"/>
-      <field cname="info" type="guint"/>
+      <field cname="target" type="GdkAtom" />
+      <field cname="flags" type="guint" />
+      <field cname="info" type="guint" />
     </struct>
     <struct name="TextAppearance" cname="GtkTextAppearance">
-      <field cname="bg_color" type="GdkColor"/>
-      <field cname="fg_color" type="GdkColor"/>
-      <field cname="bg_stipple" type="GdkBitmap*"/>
-      <field cname="fg_stipple" type="GdkBitmap*"/>
-      <field cname="rise" type="gint"/>
-      <field cname="padding1" type="gpointer"/>
-      <field cname="underline" bits="4" type="guint"/>
-      <field cname="strikethrough" bits="1" type="guint"/>
-      <field cname="draw_bg" bits="1" type="guint"/>
-      <field cname="inside_selection" bits="1" type="guint"/>
-      <field cname="is_text" bits="1" type="guint"/>
-      <field cname="pad1" bits="1" type="guint"/>
-      <field cname="pad2" bits="1" type="guint"/>
-      <field cname="pad3" bits="1" type="guint"/>
-      <field cname="pad4" bits="1" type="guint"/>
+      <field cname="bg_color" type="GdkColor" />
+      <field cname="fg_color" type="GdkColor" />
+      <field cname="bg_stipple" type="GdkBitmap*" />
+      <field cname="fg_stipple" type="GdkBitmap*" />
+      <field cname="rise" type="gint" />
+      <field cname="padding1" type="gpointer" />
+      <field cname="underline" bits="4" type="guint" />
+      <field cname="strikethrough" bits="1" type="guint" />
+      <field cname="draw_bg" bits="1" type="guint" />
+      <field cname="inside_selection" bits="1" type="guint" />
+      <field cname="is_text" bits="1" type="guint" />
+      <field cname="pad1" bits="1" type="guint" />
+      <field cname="pad2" bits="1" type="guint" />
+      <field cname="pad3" bits="1" type="guint" />
+      <field cname="pad4" bits="1" type="guint" />
     </struct>
     <boxed name="TextAttributes" cname="GtkTextAttributes">
-      <field cname="refcount" type="guint"/>
-      <field cname="appearance" type="GtkTextAppearance"/>
-      <field cname="justification" type="GtkJustification"/>
-      <field cname="direction" type="GtkTextDirection"/>
-      <field cname="font" type="PangoFontDescription*"/>
-      <field cname="font_scale" type="gdouble"/>
-      <field cname="left_margin" type="gint"/>
-      <field cname="indent" type="gint"/>
-      <field cname="right_margin" type="gint"/>
-      <field cname="pixels_above_lines" type="gint"/>
-      <field cname="pixels_below_lines" type="gint"/>
-      <field cname="pixels_inside_wrap" type="gint"/>
-      <field cname="tabs" type="PangoTabArray*"/>
-      <field cname="wrap_mode" type="GtkWrapMode"/>
-      <field cname="language" type="PangoLanguage*"/>
-      <field cname="padding1" type="gpointer"/>
-      <field cname="invisible" bits="1" type="guint"/>
-      <field cname="bg_full_height" bits="1" type="guint"/>
-      <field cname="editable" bits="1" type="guint"/>
-      <field cname="realized" bits="1" type="guint"/>
-      <field cname="pad1" bits="1" type="guint"/>
-      <field cname="pad2" bits="1" type="guint"/>
-      <field cname="pad3" bits="1" type="guint"/>
-      <field cname="pad4" bits="1" type="guint"/>
+      <field cname="refcount" type="guint" />
+      <field cname="appearance" type="GtkTextAppearance" />
+      <field cname="justification" type="GtkJustification" />
+      <field cname="direction" type="GtkTextDirection" />
+      <field cname="font" type="PangoFontDescription*" />
+      <field cname="font_scale" type="gdouble" />
+      <field cname="left_margin" type="gint" />
+      <field cname="indent" type="gint" />
+      <field cname="right_margin" type="gint" />
+      <field cname="pixels_above_lines" type="gint" />
+      <field cname="pixels_below_lines" type="gint" />
+      <field cname="pixels_inside_wrap" type="gint" />
+      <field cname="tabs" type="PangoTabArray*" />
+      <field cname="wrap_mode" type="GtkWrapMode" />
+      <field cname="language" type="PangoLanguage*" />
+      <field cname="padding1" type="gpointer" />
+      <field cname="invisible" bits="1" type="guint" />
+      <field cname="bg_full_height" bits="1" type="guint" />
+      <field cname="editable" bits="1" type="guint" />
+      <field cname="realized" bits="1" type="guint" />
+      <field cname="pad1" bits="1" type="guint" />
+      <field cname="pad2" bits="1" type="guint" />
+      <field cname="pad3" bits="1" type="guint" />
+      <field cname="pad4" bits="1" type="guint" />
       <method name="Copy" cname="gtk_text_attributes_copy">
-        <return-type type="GtkTextAttributes*"/>
+        <return-type type="GtkTextAttributes*" />
       </method>
       <method name="CopyValues" cname="gtk_text_attributes_copy_values">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextAttributes*" name="dest"/>
+          <parameter type="GtkTextAttributes*" name="dest" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_text_attributes_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
-      <constructor cname="gtk_text_attributes_new"/>
+      <constructor cname="gtk_text_attributes_new" />
       <method name="Ref" cname="gtk_text_attributes_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Unref" cname="gtk_text_attributes_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </boxed>
-    <struct name="TextBTree" cname="GtkTextBTree" opaque="true"/>
-    <struct name="TextCounter" cname="GtkTextCounter" opaque="true"/>
+    <struct name="TextBTree" cname="GtkTextBTree" opaque="true" />
+    <struct name="TextCounter" cname="GtkTextCounter" opaque="true" />
     <boxed name="TextIter" cname="GtkTextIter">
-      <field cname="dummy1" type="gpointer"/>
-      <field cname="dummy2" type="gpointer"/>
-      <field cname="dummy3" type="gint"/>
-      <field cname="dummy4" type="gint"/>
-      <field cname="dummy5" type="gint"/>
-      <field cname="dummy6" type="gint"/>
-      <field cname="dummy7" type="gint"/>
-      <field cname="dummy8" type="gint"/>
-      <field cname="dummy9" type="gpointer"/>
-      <field cname="dummy10" type="gpointer"/>
-      <field cname="dummy11" type="gint"/>
-      <field cname="dummy12" type="gint"/>
-      <field cname="dummy13" type="gint"/>
-      <field cname="dummy14" type="gpointer"/>
+      <field cname="dummy1" type="gpointer" />
+      <field cname="dummy2" type="gpointer" />
+      <field cname="dummy3" type="gint" />
+      <field cname="dummy4" type="gint" />
+      <field cname="dummy5" type="gint" />
+      <field cname="dummy6" type="gint" />
+      <field cname="dummy7" type="gint" />
+      <field cname="dummy8" type="gint" />
+      <field cname="dummy9" type="gpointer" />
+      <field cname="dummy10" type="gpointer" />
+      <field cname="dummy11" type="gint" />
+      <field cname="dummy12" type="gint" />
+      <field cname="dummy13" type="gint" />
+      <field cname="dummy14" type="gpointer" />
       <method name="BackwardChar" cname="gtk_text_iter_backward_char">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="BackwardChars" cname="gtk_text_iter_backward_chars">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="BackwardCursorPosition" cname="gtk_text_iter_backward_cursor_position">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="BackwardCursorPositions" cname="gtk_text_iter_backward_cursor_positions">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="BackwardFindChar" cname="gtk_text_iter_backward_find_char">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextCharPredicate" name="pred"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
+          <parameter type="GtkTextCharPredicate" name="pred" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="const-GtkTextIter*" name="limit" />
         </parameters>
       </method>
       <method name="BackwardLine" cname="gtk_text_iter_backward_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="BackwardLines" cname="gtk_text_iter_backward_lines">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="BackwardSearch" cname="gtk_text_iter_backward_search">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkTextSearchFlags" name="flags"/>
-          <parameter type="GtkTextIter*" name="match_start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="match_end" pass_as="out"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="GtkTextSearchFlags" name="flags" />
+          <parameter type="GtkTextIter*" name="match_start" pass_as="out" />
+          <parameter type="GtkTextIter*" name="match_end" pass_as="out" />
+          <parameter type="const-GtkTextIter*" name="limit" />
         </parameters>
       </method>
       <method name="BackwardSentenceStart" cname="gtk_text_iter_backward_sentence_start">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="BackwardSentenceStarts" cname="gtk_text_iter_backward_sentence_starts">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="BackwardToTagToggle" cname="gtk_text_iter_backward_to_tag_toggle">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag" null_ok="1"/>
+          <parameter type="GtkTextTag*" name="tag" null_ok="1" />
         </parameters>
       </method>
       <method name="BackwardWordStart" cname="gtk_text_iter_backward_word_start">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="BackwardWordStarts" cname="gtk_text_iter_backward_word_starts">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="BeginsTag" cname="gtk_text_iter_begins_tag">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
       <method name="CanInsert" cname="gtk_text_iter_can_insert">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="default_editability"/>
+          <parameter type="gboolean" name="default_editability" />
         </parameters>
       </method>
       <method name="Compare" cname="gtk_text_iter_compare">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="rhs"/>
+          <parameter type="const-GtkTextIter*" name="rhs" />
         </parameters>
       </method>
       <method name="Copy" cname="gtk_text_iter_copy">
-        <return-type type="GtkTextIter*"/>
+        <return-type type="GtkTextIter*" />
       </method>
       <method name="Editable" cname="gtk_text_iter_editable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="default_setting"/>
+          <parameter type="gboolean" name="default_setting" />
         </parameters>
       </method>
       <method name="EndsLine" cname="gtk_text_iter_ends_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="EndsSentence" cname="gtk_text_iter_ends_sentence">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="EndsTag" cname="gtk_text_iter_ends_tag">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
       <method name="EndsWord" cname="gtk_text_iter_ends_word">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Equal" cname="gtk_text_iter_equal">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="rhs"/>
+          <parameter type="const-GtkTextIter*" name="rhs" />
         </parameters>
       </method>
       <method name="ForwardChar" cname="gtk_text_iter_forward_char">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardChars" cname="gtk_text_iter_forward_chars">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="ForwardCursorPosition" cname="gtk_text_iter_forward_cursor_position">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardCursorPositions" cname="gtk_text_iter_forward_cursor_positions">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="ForwardFindChar" cname="gtk_text_iter_forward_find_char">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextCharPredicate" name="pred"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
+          <parameter type="GtkTextCharPredicate" name="pred" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="const-GtkTextIter*" name="limit" />
         </parameters>
       </method>
       <method name="ForwardLine" cname="gtk_text_iter_forward_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardLines" cname="gtk_text_iter_forward_lines">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="ForwardSearch" cname="gtk_text_iter_forward_search">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkTextSearchFlags" name="flags"/>
-          <parameter type="GtkTextIter*" name="match_start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="match_end" pass_as="out"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="GtkTextSearchFlags" name="flags" />
+          <parameter type="GtkTextIter*" name="match_start" pass_as="out" />
+          <parameter type="GtkTextIter*" name="match_end" pass_as="out" />
+          <parameter type="const-GtkTextIter*" name="limit" />
         </parameters>
       </method>
       <method name="ForwardSentenceEnd" cname="gtk_text_iter_forward_sentence_end">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardSentenceEnds" cname="gtk_text_iter_forward_sentence_ends">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="ForwardToEnd" cname="gtk_text_iter_forward_to_end">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ForwardToLineEnd" cname="gtk_text_iter_forward_to_line_end">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardToTagToggle" cname="gtk_text_iter_forward_to_tag_toggle">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag" null_ok="1"/>
+          <parameter type="GtkTextTag*" name="tag" null_ok="1" />
         </parameters>
       </method>
       <method name="ForwardWordEnd" cname="gtk_text_iter_forward_word_end">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ForwardWordEnds" cname="gtk_text_iter_forward_word_ends">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gint" name="count"/>
+          <parameter type="gint" name="count" />
         </parameters>
       </method>
       <method name="Free" cname="gtk_text_iter_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetAttributes" cname="gtk_text_iter_get_attributes">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextAttributes*" name="values"/>
+          <parameter type="GtkTextAttributes*" name="values" />
         </parameters>
       </method>
       <method name="GetBuffer" cname="gtk_text_iter_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
+        <return-type type="GtkTextBuffer*" />
       </method>
       <method name="GetBytesInLine" cname="gtk_text_iter_get_bytes_in_line">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetChar" cname="gtk_text_iter_get_char">
-        <return-type type="gunichar"/>
+        <return-type type="gunichar" />
       </method>
       <method name="GetCharsInLine" cname="gtk_text_iter_get_chars_in_line">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetChildAnchor" cname="gtk_text_iter_get_child_anchor">
-        <return-type type="GtkTextChildAnchor*"/>
+        <return-type type="GtkTextChildAnchor*" />
       </method>
       <method name="GetLanguage" cname="gtk_text_iter_get_language">
-        <return-type type="PangoLanguage*"/>
+        <return-type type="PangoLanguage*" />
       </method>
       <method name="GetLine" cname="gtk_text_iter_get_line">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetLineIndex" cname="gtk_text_iter_get_line_index">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetLineOffset" cname="gtk_text_iter_get_line_offset">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetMarks" cname="gtk_text_iter_get_marks">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="GetOffset" cname="gtk_text_iter_get_offset">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetPixbuf" cname="gtk_text_iter_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
+        <return-type type="GdkPixbuf*" />
       </method>
       <method name="GetSlice" cname="gtk_text_iter_get_slice">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="GetTags" cname="gtk_text_iter_get_tags">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="GetText" cname="gtk_text_iter_get_text">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="GetToggledTags" cname="gtk_text_iter_get_toggled_tags">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
         <parameters>
-          <parameter type="gboolean" name="toggled_on"/>
+          <parameter type="gboolean" name="toggled_on" />
         </parameters>
       </method>
       <method name="GetType" cname="gtk_text_iter_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="GetVisibleLineIndex" cname="gtk_text_iter_get_visible_line_index">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetVisibleLineOffset" cname="gtk_text_iter_get_visible_line_offset">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetVisibleSlice" cname="gtk_text_iter_get_visible_slice">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="GetVisibleText" cname="gtk_text_iter_get_visible_text">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="HasTag" cname="gtk_text_iter_has_tag">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
       <method name="InRange" cname="gtk_text_iter_in_range">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="const-GtkTextIter*" name="start" />
+          <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
       <method name="InsideSentence" cname="gtk_text_iter_inside_sentence">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="InsideWord" cname="gtk_text_iter_inside_word">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsCursorPosition" cname="gtk_text_iter_is_cursor_position">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsEnd" cname="gtk_text_iter_is_end">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IsStart" cname="gtk_text_iter_is_start">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="Order" cname="gtk_text_iter_order">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextIter*" name="second"/>
+          <parameter type="GtkTextIter*" name="second" />
         </parameters>
       </method>
       <method name="SetLine" cname="gtk_text_iter_set_line">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="line_number"/>
+          <parameter type="gint" name="line_number" />
         </parameters>
       </method>
       <method name="SetLineIndex" cname="gtk_text_iter_set_line_index">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="byte_on_line"/>
+          <parameter type="gint" name="byte_on_line" />
         </parameters>
       </method>
       <method name="SetLineOffset" cname="gtk_text_iter_set_line_offset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="char_on_line"/>
+          <parameter type="gint" name="char_on_line" />
         </parameters>
       </method>
       <method name="SetOffset" cname="gtk_text_iter_set_offset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="char_offset"/>
+          <parameter type="gint" name="char_offset" />
         </parameters>
       </method>
       <method name="SetVisibleLineIndex" cname="gtk_text_iter_set_visible_line_index">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="byte_on_line"/>
+          <parameter type="gint" name="byte_on_line" />
         </parameters>
       </method>
       <method name="SetVisibleLineOffset" cname="gtk_text_iter_set_visible_line_offset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="char_on_line"/>
+          <parameter type="gint" name="char_on_line" />
         </parameters>
       </method>
       <method name="StartsLine" cname="gtk_text_iter_starts_line">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="StartsSentence" cname="gtk_text_iter_starts_sentence">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="StartsWord" cname="gtk_text_iter_starts_word">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="TogglesTag" cname="gtk_text_iter_toggles_tag">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </method>
     </boxed>
     <struct name="TextLineSegment" cname="GtkTextLineSegment">
-      <field cname="type" type="GtkTextLineSegmentClass*"/>
-      <field cname="next" type="GtkTextLineSegment*"/>
-      <field cname="char_count" type="int"/>
-      <field cname="byte_count" type="int"/>
-      <field cname="chars" array_len="4" type="char"/>
+      <field cname="type" type="GtkTextLineSegmentClass*" />
+      <field cname="next" type="GtkTextLineSegment*" />
+      <field cname="char_count" type="int" />
+      <field cname="byte_count" type="int" />
+      <field cname="chars" array_len="4" type="char" />
       <method name="Split" cname="gtk_text_line_segment_split" shared="true">
-        <return-type type="GtkTextLineSegment*"/>
+        <return-type type="GtkTextLineSegment*" />
         <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
+          <parameter type="const-GtkTextIter*" name="iter" />
         </parameters>
       </method>
     </struct>
     <struct name="TextLineSegmentClass" cname="GtkTextLineSegmentClass">
-      <field cname="name" type="char*"/>
-      <field cname="leftGravity" type="gboolean"/>
-      <field cname="splitFunc" type="GtkTextSegSplitFunc"/>
-      <field cname="deleteFunc" type="GtkTextSegDeleteFunc"/>
-      <field cname="cleanupFunc" type="GtkTextSegCleanupFunc"/>
-      <field cname="lineChangeFunc" type="GtkTextSegLineChangeFunc"/>
-      <field cname="checkFunc" type="GtkTextSegCheckFunc"/>
+      <field cname="name" type="char*" />
+      <field cname="leftGravity" type="gboolean" />
+      <field cname="splitFunc" type="GtkTextSegSplitFunc" />
+      <field cname="deleteFunc" type="GtkTextSegDeleteFunc" />
+      <field cname="cleanupFunc" type="GtkTextSegCleanupFunc" />
+      <field cname="lineChangeFunc" type="GtkTextSegLineChangeFunc" />
+      <field cname="checkFunc" type="GtkTextSegCheckFunc" />
     </struct>
-    <struct name="TextLogAttrCache" cname="GtkTextLogAttrCache" opaque="true"/>
-    <struct name="TextMarkBody" cname="GtkTextMarkBody" opaque="true"/>
-    <struct name="TextPendingScroll" cname="GtkTextPendingScroll" opaque="true"/>
+    <struct name="TextLogAttrCache" cname="GtkTextLogAttrCache" opaque="true" />
+    <struct name="TextMarkBody" cname="GtkTextMarkBody" opaque="true" />
+    <struct name="TextPendingScroll" cname="GtkTextPendingScroll" opaque="true" />
     <struct name="TextTagInfo" cname="GtkTextTagInfo">
-      <field cname="tag" type="GtkTextTag*"/>
-      <field cname="tag_root" type="GtkTextBTreeNode*"/>
-      <field cname="toggle_count" type="gint"/>
+      <field cname="tag" type="GtkTextTag*" />
+      <field cname="tag_root" type="GtkTextBTreeNode*" />
+      <field cname="toggle_count" type="gint" />
     </struct>
     <struct name="TextToggleBody" cname="GtkTextToggleBody">
-      <field cname="info" type="GtkTextTagInfo*"/>
-      <field cname="inNodeCounts" type="gboolean"/>
+      <field cname="info" type="GtkTextTagInfo*" />
+      <field cname="inNodeCounts" type="gboolean" />
     </struct>
-    <struct name="TextWindow" cname="GtkTextWindow" opaque="true"/>
+    <struct name="TextWindow" cname="GtkTextWindow" opaque="true" />
     <struct name="ToolbarChild" cname="GtkToolbarChild" hidden="1">
-      <field cname="type" type="GtkToolbarChildType"/>
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="icon" type="GtkWidget*"/>
-      <field cname="label" type="GtkWidget*"/>
+      <field cname="type" type="GtkToolbarChildType" />
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="icon" type="GtkWidget*" />
+      <field cname="label" type="GtkWidget*" />
     </struct>
     <struct name="TooltipsData" cname="GtkTooltipsData">
-      <field cname="tooltips" type="GtkTooltips*"/>
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="tip_text" type="gchar*"/>
-      <field cname="tip_private" type="gchar*"/>
+      <field cname="tooltips" type="GtkTooltips*" />
+      <field cname="widget" type="GtkWidget*" />
+      <field cname="tip_text" type="gchar*" />
+      <field cname="tip_private" type="gchar*" />
       <method name="Get" cname="gtk_tooltips_data_get" shared="true">
-        <return-type type="GtkTooltipsData*"/>
+        <return-type type="GtkTooltipsData*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </struct>
     <struct name="TreeDataList" cname="GtkTreeDataList">
-      <field cname="next" type="GtkTreeDataList*"/>
-      <field cname="v_int" type="gint"/>
+      <field cname="next" type="GtkTreeDataList*" />
+      <field cname="v_int" type="gint" />
       <method name="CompareFunc" cname="gtk_tree_data_list_compare_func" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkTreeModel*" name="model"/>
-          <parameter type="GtkTreeIter*" name="a"/>
-          <parameter type="GtkTreeIter*" name="b"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkTreeModel*" name="model" />
+          <parameter type="GtkTreeIter*" name="a" />
+          <parameter type="GtkTreeIter*" name="b" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
     </struct>
     <boxed name="TreeIter" cname="GtkTreeIter">
-      <field cname="stamp" type="gint"/>
-      <field cname="user_data" type="gpointer"/>
-      <field cname="user_data2" type="gpointer"/>
-      <field cname="user_data3" type="gpointer"/>
+      <field cname="stamp" type="gint" />
+      <field cname="user_data" type="gpointer" />
+      <field cname="user_data2" type="gpointer" />
+      <field cname="user_data3" type="gpointer" />
       <method name="Copy" cname="gtk_tree_iter_copy">
-        <return-type type="GtkTreeIter*"/>
+        <return-type type="GtkTreeIter*" />
       </method>
       <method name="Free" cname="gtk_tree_iter_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetType" cname="gtk_tree_iter_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </boxed>
     <boxed name="TreePath" cname="GtkTreePath" opaque="true">
       <method name="AppendIndex" cname="gtk_tree_path_append_index">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="index_"/>
+          <parameter type="gint" name="index_" />
         </parameters>
       </method>
       <method name="Compare" cname="gtk_tree_path_compare">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="const-GtkTreePath*" name="b"/>
+          <parameter type="const-GtkTreePath*" name="b" />
         </parameters>
       </method>
       <method name="Copy" cname="gtk_tree_path_copy">
-        <return-type type="GtkTreePath*"/>
+        <return-type type="GtkTreePath*" />
       </method>
       <method name="Down" cname="gtk_tree_path_down">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Free" cname="gtk_tree_path_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetDepth" cname="gtk_tree_path_get_depth">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetIndices" cname="gtk_tree_path_get_indices" hidden="1">
-        <return-type type="gint*"/>
+        <return-type type="gint*" />
       </method>
       <method name="GetType" cname="gtk_tree_path_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="IsAncestor" cname="gtk_tree_path_is_ancestor">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="descendant"/>
+          <parameter type="GtkTreePath*" name="descendant" />
         </parameters>
       </method>
       <method name="IsDescendant" cname="gtk_tree_path_is_descendant">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkTreePath*" name="ancestor"/>
+          <parameter type="GtkTreePath*" name="ancestor" />
         </parameters>
       </method>
-      <constructor cname="gtk_tree_path_new"/>
-      <constructor cname="gtk_tree_path_new_first"/>
+      <constructor cname="gtk_tree_path_new" />
+      <constructor cname="gtk_tree_path_new_first" />
       <constructor cname="gtk_tree_path_new_from_indices">
         <parameters>
-          <parameter type="gint" name="first_index"/>
-          <parameter ellipsis="true"/>
+          <parameter type="gint" name="first_index" />
+          <parameter ellipsis="true" />
         </parameters>
       </constructor>
       <constructor cname="gtk_tree_path_new_from_string">
         <parameters>
-          <parameter type="const-gchar*" name="path"/>
+          <parameter type="const-gchar*" name="path" />
         </parameters>
       </constructor>
       <method name="Next" cname="gtk_tree_path_next">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="PrependIndex" cname="gtk_tree_path_prepend_index">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="index_"/>
+          <parameter type="gint" name="index_" />
         </parameters>
       </method>
       <method name="Prev" cname="gtk_tree_path_prev">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ToString" cname="gtk_tree_path_to_string">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="Up" cname="gtk_tree_path_up">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
     </boxed>
     <boxed name="TreeRowReference" cname="GtkTreeRowReference" opaque="true">
       <method name="Copy" cname="gtk_tree_row_reference_copy">
-        <return-type type="GtkTreeRowReference*"/>
+        <return-type type="GtkTreeRowReference*" />
       </method>
       <method name="Deleted" cname="gtk_tree_row_reference_deleted" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GObject*" name="proxy"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GObject*" name="proxy" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <method name="Free" cname="gtk_tree_row_reference_free">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetPath" cname="gtk_tree_row_reference_get_path">
-        <return-type type="GtkTreePath*"/>
+        <return-type type="GtkTreePath*" />
       </method>
       <method name="GetType" cname="gtk_tree_row_reference_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="Inserted" cname="gtk_tree_row_reference_inserted" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GObject*" name="proxy"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GObject*" name="proxy" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
       <constructor cname="gtk_tree_row_reference_new">
         <parameters>
-          <parameter type="GtkTreeModel*" name="model"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeModel*" name="model" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </constructor>
       <constructor cname="gtk_tree_row_reference_new_proxy">
         <parameters>
-          <parameter type="GObject*" name="proxy"/>
-          <parameter type="GtkTreeModel*" name="model"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GObject*" name="proxy" />
+          <parameter type="GtkTreeModel*" name="model" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </constructor>
       <method name="Reordered" cname="gtk_tree_row_reference_reordered" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GObject*" name="proxy"/>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint*" name="new_order"/>
+          <parameter type="GObject*" name="proxy" />
+          <parameter type="GtkTreePath*" name="path" />
+          <parameter type="GtkTreeIter*" name="iter" />
+          <parameter type="gint*" name="new_order" />
         </parameters>
       </method>
       <method name="Valid" cname="gtk_tree_row_reference_valid">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
     </boxed>
-    <alias name="Type" cname="GtkType" type="GType"/>
+    <alias name="Type" cname="GtkType" type="GType" />
     <struct name="WidgetAuxInfo" cname="GtkWidgetAuxInfo" hidden="1">
-      <field cname="x" type="gint"/>
-      <field cname="y" type="gint"/>
-      <field cname="width" type="gint"/>
-      <field cname="height" type="gint"/>
-      <field cname="x_set" bits="1" type="guint"/>
-      <field cname="y_set" bits="1" type="guint"/>
+      <field cname="x" type="gint" />
+      <field cname="y" type="gint" />
+      <field cname="width" type="gint" />
+      <field cname="height" type="gint" />
+      <field cname="x_set" bits="1" type="guint" />
+      <field cname="y_set" bits="1" type="guint" />
     </struct>
     <struct name="WidgetShapeInfo" cname="GtkWidgetShapeInfo" hidden="1">
-      <field cname="offset_x" type="gint16"/>
-      <field cname="offset_y" type="gint16"/>
-      <field cname="shape_mask" type="GdkBitmap*"/>
+      <field cname="offset_x" type="gint16" />
+      <field cname="offset_y" type="gint16" />
+      <field cname="shape_mask" type="GdkBitmap*" />
     </struct>
-    <struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo" opaque="true" hidden="1"/>
+    <struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo" opaque="true" hidden="1" />
     <class name="Accel" cname="GtkAccel_">
       <method name="GroupsActivate" cname="gtk_accel_groups_activate" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GObject*" name="object"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
+          <parameter type="GObject*" name="object" />
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
         </parameters>
       </method>
       <method name="GroupsFromObject" cname="gtk_accel_groups_from_object" shared="true">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
         <parameters>
-          <parameter type="GObject*" name="object"/>
+          <parameter type="GObject*" name="object" />
         </parameters>
       </method>
       <method name="MapAddEntry" cname="gtk_accel_map_add_entry" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
+          <parameter type="const-gchar*" name="accel_path" />
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
         </parameters>
       </method>
       <method name="MapAddFilter" cname="gtk_accel_map_add_filter" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filter_pattern"/>
+          <parameter type="const-gchar*" name="filter_pattern" />
         </parameters>
       </method>
       <method name="MapChangeEntry" cname="gtk_accel_map_change_entry" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
-          <parameter type="gboolean" name="replace"/>
+          <parameter type="const-gchar*" name="accel_path" />
+          <parameter type="guint" name="accel_key" />
+          <parameter type="GdkModifierType" name="accel_mods" />
+          <parameter type="gboolean" name="replace" />
         </parameters>
       </method>
       <method name="MapForeach" cname="gtk_accel_map_foreach" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkAccelMapForeach" name="foreach_func"/>
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkAccelMapForeach" name="foreach_func" />
         </parameters>
       </method>
       <method name="MapForeachUnfiltered" cname="gtk_accel_map_foreach_unfiltered" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkAccelMapForeach" name="foreach_func"/>
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkAccelMapForeach" name="foreach_func" />
         </parameters>
       </method>
       <method name="MapLoad" cname="gtk_accel_map_load" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="file_name"/>
+          <parameter type="const-gchar*" name="file_name" />
         </parameters>
       </method>
       <method name="MapLoadFd" cname="gtk_accel_map_load_fd" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="fd"/>
+          <parameter type="gint" name="fd" />
         </parameters>
       </method>
       <method name="MapLoadScanner" cname="gtk_accel_map_load_scanner" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GScanner*" name="scanner"/>
+          <parameter type="GScanner*" name="scanner" />
         </parameters>
       </method>
       <method name="MapLookupEntry" cname="gtk_accel_map_lookup_entry" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="accel_path"/>
-          <parameter type="GtkAccelKey*" name="key"/>
+          <parameter type="const-gchar*" name="accel_path" />
+          <parameter type="GtkAccelKey*" name="key" />
         </parameters>
       </method>
       <method name="MapSave" cname="gtk_accel_map_save" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="file_name"/>
+          <parameter type="const-gchar*" name="file_name" />
         </parameters>
       </method>
       <method name="MapSaveFd" cname="gtk_accel_map_save_fd" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gint" name="fd"/>
+          <parameter type="gint" name="fd" />
         </parameters>
       </method>
     </class>
     <class name="Accelerator" cname="GtkAccelerator_">
       <method name="GetDefaultModMask" cname="gtk_accelerator_get_default_mod_mask" shared="true">
-        <return-type type="GdkModifierType"/>
+        <return-type type="GdkModifierType" />
       </method>
       <method name="Name" cname="gtk_accelerator_name" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="guint" name="accelerator_key"/>
-          <parameter type="GdkModifierType" name="accelerator_mods"/>
+          <parameter type="guint" name="accelerator_key" />
+          <parameter type="GdkModifierType" name="accelerator_mods" />
         </parameters>
       </method>
       <method name="Parse" cname="gtk_accelerator_parse" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="accelerator"/>
-          <parameter type="guint*" name="accelerator_key"/>
-          <parameter type="GdkModifierType*" name="accelerator_mods"/>
+          <parameter type="const-gchar*" name="accelerator" />
+          <parameter type="guint*" name="accelerator_key" />
+          <parameter type="GdkModifierType*" name="accelerator_mods" />
         </parameters>
       </method>
       <method name="SetDefaultModMask" cname="gtk_accelerator_set_default_mod_mask" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkModifierType" name="default_mod_mask"/>
+          <parameter type="GdkModifierType" name="default_mod_mask" />
         </parameters>
       </method>
       <method name="Valid" cname="gtk_accelerator_valid" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
         </parameters>
       </method>
     </class>
     <class name="Global" cname="GtkGlobal">
       <method name="BindingParseBinding" cname="gtk_binding_parse_binding" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GScanner*" name="scanner"/>
+          <parameter type="GScanner*" name="scanner" />
         </parameters>
       </method>
       <method name="BindingsActivate" cname="gtk_bindings_activate" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkObject*" name="object"/>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifiers"/>
+          <parameter type="GtkObject*" name="object" />
+          <parameter type="guint" name="keyval" />
+          <parameter type="GdkModifierType" name="modifiers" />
         </parameters>
       </method>
       <method name="CellTypeGetType" cname="gtk_cell_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="CheckVersion" cname="gtk_check_version" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="guint" name="required_major"/>
-          <parameter type="guint" name="required_minor"/>
-          <parameter type="guint" name="required_micro"/>
+          <parameter type="guint" name="required_major" />
+          <parameter type="guint" name="required_minor" />
+          <parameter type="guint" name="required_micro" />
         </parameters>
       </method>
       <method name="ClistDragPosGetType" cname="gtk_clist_drag_pos_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="DisableSetlocale" cname="gtk_disable_setlocale" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="EventsPending" cname="gtk_events_pending" shared="true">
-        <return-type type="gint"/>
+        <return-type type="gint" />
       </method>
       <method name="GetCurrentEvent" cname="gtk_get_current_event" shared="true">
-        <return-type type="GdkEvent*"/>
+        <return-type type="GdkEvent*" />
       </method>
       <method name="GetCurrentEventState" cname="gtk_get_current_event_state" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkModifierType*" name="state"/>
+          <parameter type="GdkModifierType*" name="state" />
         </parameters>
       </method>
       <method name="GetCurrentEventTime" cname="gtk_get_current_event_time" shared="true">
-        <return-type type="guint32"/>
+        <return-type type="guint32" />
       </method>
       <method name="GetDefaultLanguage" cname="gtk_get_default_language" shared="true">
-        <return-type type="PangoLanguage*"/>
+        <return-type type="PangoLanguage*" />
       </method>
       <method name="GetEventWidget" cname="gtk_get_event_widget" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="IdentifierGetType" cname="gtk_identifier_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="MatchTypeGetType" cname="gtk_match_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PreviewTypeGetType" cname="gtk_preview_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PrivateFlagsGetType" cname="gtk_private_flags_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PropagateEvent" cname="gtk_propagate_event" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="RgbToHsv" cname="gtk_rgb_to_hsv" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="r"/>
-          <parameter type="gdouble" name="g"/>
-          <parameter type="gdouble" name="b"/>
-          <parameter type="gdouble*" name="h"/>
-          <parameter type="gdouble*" name="s"/>
-          <parameter type="gdouble*" name="v"/>
+          <parameter type="gdouble" name="r" />
+          <parameter type="gdouble" name="g" />
+          <parameter type="gdouble" name="b" />
+          <parameter type="gdouble*" name="h" />
+          <parameter type="gdouble*" name="s" />
+          <parameter type="gdouble*" name="v" />
         </parameters>
       </method>
       <method name="SetLocale" cname="gtk_set_locale" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="SideTypeGetType" cname="gtk_side_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="SignalRunTypeGetType" cname="gtk_signal_run_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="TypeClass" cname="gtk_type_class" shared="true">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
         <parameters>
-          <parameter type="GtkType" name="type"/>
+          <parameter type="GtkType" name="type" />
         </parameters>
       </method>
     </class>
     <class name="Ctree" cname="GtkCtree_">
       <method name="ExpanderStyleGetType" cname="gtk_ctree_expander_style_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="ExpansionTypeGetType" cname="gtk_ctree_expansion_type_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="LineStyleGetType" cname="gtk_ctree_line_style_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PosGetType" cname="gtk_ctree_pos_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </class>
     <class name="Decorated" cname="GtkDecorated_">
       <method name="WindowCalculateFrameSize" cname="gtk_decorated_window_calculate_frame_size" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </method>
       <method name="WindowInit" cname="gtk_decorated_window_init" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
+          <parameter type="GtkWindow*" name="window" />
         </parameters>
       </method>
       <method name="WindowMoveResizeWindow" cname="gtk_decorated_window_move_resize_window" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="WindowSetTitle" cname="gtk_decorated_window_set_title" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWindow*" name="window"/>
-          <parameter type="const-gchar*" name="title"/>
+          <parameter type="GtkWindow*" name="window" />
+          <parameter type="const-gchar*" name="title" />
         </parameters>
       </method>
     </class>
     <class name="Drag" cname="GtkDrag_">
       <method name="Begin" cname="gtk_drag_begin" shared="true">
-        <return-type type="GdkDragContext*"/>
+        <return-type type="GdkDragContext*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkTargetList*" name="targets"/>
-          <parameter type="GdkDragAction" name="actions"/>
-          <parameter type="gint" name="button"/>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkTargetList*" name="targets" />
+          <parameter type="GdkDragAction" name="actions" />
+          <parameter type="gint" name="button" />
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="CheckThreshold" cname="gtk_drag_check_threshold" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="start_x"/>
-          <parameter type="gint" name="start_y"/>
-          <parameter type="gint" name="current_x"/>
-          <parameter type="gint" name="current_y"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gint" name="start_x" />
+          <parameter type="gint" name="start_y" />
+          <parameter type="gint" name="current_x" />
+          <parameter type="gint" name="current_y" />
         </parameters>
       </method>
       <method name="DestFindTarget" cname="gtk_drag_dest_find_target" shared="true">
-        <return-type type="GdkAtom"/>
+        <return-type type="GdkAtom" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GtkTargetList*" name="target_list"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GtkTargetList*" name="target_list" />
         </parameters>
       </method>
       <method name="DestGetTargetList" cname="gtk_drag_dest_get_target_list" shared="true">
-        <return-type type="GtkTargetList*"/>
+        <return-type type="GtkTargetList*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="DestSet" cname="gtk_drag_dest_set" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkDestDefaults" name="flags"/>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="gint" name="n_targets"/>
-          <parameter type="GdkDragAction" name="actions"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkDestDefaults" name="flags" />
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="gint" name="n_targets" />
+          <parameter type="GdkDragAction" name="actions" />
         </parameters>
       </method>
       <method name="DestSetProxy" cname="gtk_drag_dest_set_proxy" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkWindow*" name="proxy_window"/>
-          <parameter type="GdkDragProtocol" name="protocol"/>
-          <parameter type="gboolean" name="use_coordinates"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkWindow*" name="proxy_window" />
+          <parameter type="GdkDragProtocol" name="protocol" />
+          <parameter type="gboolean" name="use_coordinates" />
         </parameters>
       </method>
       <method name="DestSetTargetList" cname="gtk_drag_dest_set_target_list" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GtkTargetList*" name="target_list"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GtkTargetList*" name="target_list" />
         </parameters>
       </method>
       <method name="DestUnset" cname="gtk_drag_dest_unset" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="Finish" cname="gtk_drag_finish" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="gboolean" name="success"/>
-          <parameter type="gboolean" name="del"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="gboolean" name="success" />
+          <parameter type="gboolean" name="del" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="GetData" cname="gtk_drag_get_data" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="GetSourceWidget" cname="gtk_drag_get_source_widget" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
+          <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </method>
       <method name="Highlight" cname="gtk_drag_highlight" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="SetIconDefault" cname="gtk_drag_set_icon_default" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
+          <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </method>
       <method name="SetIconPixbuf" cname="gtk_drag_set_icon_pixbuf" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-          <parameter type="gint" name="hot_x"/>
-          <parameter type="gint" name="hot_y"/>
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GdkPixbuf*" name="pixbuf" />
+          <parameter type="gint" name="hot_x" />
+          <parameter type="gint" name="hot_y" />
         </parameters>
       </method>
       <method name="SetIconPixmap" cname="gtk_drag_set_icon_pixmap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GdkColormap*" name="colormap"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-          <parameter type="gint" name="hot_x"/>
-          <parameter type="gint" name="hot_y"/>
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GdkColormap*" name="colormap" />
+          <parameter type="GdkPixmap*" name="pixmap" />
+          <parameter type="GdkBitmap*" name="mask" />
+          <parameter type="gint" name="hot_x" />
+          <parameter type="gint" name="hot_y" />
         </parameters>
       </method>
       <method name="SetIconStock" cname="gtk_drag_set_icon_stock" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="gint" name="hot_x"/>
-          <parameter type="gint" name="hot_y"/>
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="gint" name="hot_x" />
+          <parameter type="gint" name="hot_y" />
         </parameters>
       </method>
       <method name="SetIconWidget" cname="gtk_drag_set_icon_widget" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkDragContext*" name="context"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="hot_x"/>
-          <parameter type="gint" name="hot_y"/>
+          <parameter type="GdkDragContext*" name="context" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gint" name="hot_x" />
+          <parameter type="gint" name="hot_y" />
         </parameters>
       </method>
       <method name="SourceSet" cname="gtk_drag_source_set" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkModifierType" name="start_button_mask"/>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="gint" name="n_targets"/>
-          <parameter type="GdkDragAction" name="actions"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkModifierType" name="start_button_mask" />
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="gint" name="n_targets" />
+          <parameter type="GdkDragAction" name="actions" />
         </parameters>
       </method>
       <method name="SourceSetIcon" cname="gtk_drag_source_set_icon" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkColormap*" name="colormap"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkColormap*" name="colormap" />
+          <parameter type="GdkPixmap*" name="pixmap" />
+          <parameter type="GdkBitmap*" name="mask" />
         </parameters>
       </method>
       <method name="SourceSetIconPixbuf" cname="gtk_drag_source_set_icon_pixbuf" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </method>
       <method name="SourceSetIconStock" cname="gtk_drag_source_set_icon_stock" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="stock_id" />
         </parameters>
       </method>
       <method name="SourceUnset" cname="gtk_drag_source_unset" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="Unhighlight" cname="gtk_drag_unhighlight" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </class>
     <class name="Gc" cname="GtkGc_">
       <method name="Get" cname="gtk_gc_get" shared="true">
-        <return-type type="GdkGC*"/>
+        <return-type type="GdkGC*" />
         <parameters>
-          <parameter type="gint" name="depth"/>
-          <parameter type="GdkColormap*" name="colormap"/>
-          <parameter type="GdkGCValues*" name="values"/>
-          <parameter type="GdkGCValuesMask" name="values_mask"/>
+          <parameter type="gint" name="depth" />
+          <parameter type="GdkColormap*" name="colormap" />
+          <parameter type="GdkGCValues*" name="values" />
+          <parameter type="GdkGCValuesMask" name="values_mask" />
         </parameters>
       </method>
       <method name="Release" cname="gtk_gc_release" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkGC*" name="gc"/>
+          <parameter type="GdkGC*" name="gc" />
         </parameters>
       </method>
     </class>
     <class name="Grab" cname="GtkGrab_">
       <method name="Add" cname="gtk_grab_add" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="GetCurrent" cname="gtk_grab_get_current" shared="true">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
       </method>
       <method name="Remove" cname="gtk_grab_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </class>
     <class name="Icon" cname="GtkIcon_">
       <method name="SizeFromName" cname="gtk_icon_size_from_name" shared="true">
-        <return-type type="GtkIconSize"/>
+        <return-type type="GtkIconSize" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-gchar*" name="name" />
         </parameters>
       </method>
       <method name="SizeGetName" cname="gtk_icon_size_get_name" shared="true">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
         <parameters>
-          <parameter type="GtkIconSize" name="size"/>
+          <parameter type="GtkIconSize" name="size" />
         </parameters>
       </method>
       <method name="SizeLookup" cname="gtk_icon_size_lookup" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkIconSize" name="size"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="GtkIconSize" name="size" />
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="SizeLookupForSettings" cname="gtk_icon_size_lookup_for_settings" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkSettings*" name="settings"/>
-          <parameter type="GtkIconSize" name="size"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="GtkSettings*" name="settings" />
+          <parameter type="GtkIconSize" name="size" />
+          <parameter type="gint*" name="width" />
+          <parameter type="gint*" name="height" />
         </parameters>
       </method>
       <method name="SizeRegister" cname="gtk_icon_size_register" shared="true">
-        <return-type type="GtkIconSize"/>
+        <return-type type="GtkIconSize" />
         <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="const-gchar*" name="name" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="SizeRegisterAlias" cname="gtk_icon_size_register_alias" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="alias"/>
-          <parameter type="GtkIconSize" name="target"/>
+          <parameter type="const-gchar*" name="alias" />
+          <parameter type="GtkIconSize" name="target" />
         </parameters>
       </method>
     </class>
     <class name="Idle" cname="GtkIdle_" hidden="1">
       <method name="Add" cname="gtk_idle_add" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="AddFull" cname="gtk_idle_add_full" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="gint" name="priority"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="GtkCallbackMarshal" name="marshal"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="gint" name="priority" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="GtkCallbackMarshal" name="marshal" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="AddPriority" cname="gtk_idle_add_priority" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="gint" name="priority"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="gint" name="priority" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_idle_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="idle_handler_id"/>
+          <parameter type="guint" name="idle_handler_id" />
         </parameters>
       </method>
       <method name="RemoveByData" cname="gtk_idle_remove_by_data" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
     </class>
     <class name="Init" cname="GtkInit_">
       <method name="AbiCheck" cname="gtk_init_abi_check" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="int*" name="argc"/>
-          <parameter type="char***" name="argv"/>
-          <parameter type="int" name="num_checks"/>
-          <parameter type="size_t" name="sizeof_GtkWindow"/>
-          <parameter type="size_t" name="sizeof_GtkBox"/>
+          <parameter type="int*" name="argc" />
+          <parameter type="char***" name="argv" />
+          <parameter type="int" name="num_checks" />
+          <parameter type="size_t" name="sizeof_GtkWindow" />
+          <parameter type="size_t" name="sizeof_GtkBox" />
         </parameters>
       </method>
       <method name="Add" cname="gtk_init_add" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="Check" cname="gtk_init_check" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="int*" name="argc"/>
-          <parameter type="char***" name="argv"/>
+          <parameter type="int*" name="argc" />
+          <parameter type="char***" name="argv" />
         </parameters>
       </method>
       <method name="CheckAbiCheck" cname="gtk_init_check_abi_check" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="int*" name="argc"/>
-          <parameter type="char***" name="argv"/>
-          <parameter type="int" name="num_checks"/>
-          <parameter type="size_t" name="sizeof_GtkWindow"/>
-          <parameter type="size_t" name="sizeof_GtkBox"/>
+          <parameter type="int*" name="argc" />
+          <parameter type="char***" name="argv" />
+          <parameter type="int" name="num_checks" />
+          <parameter type="size_t" name="sizeof_GtkWindow" />
+          <parameter type="size_t" name="sizeof_GtkBox" />
         </parameters>
       </method>
     </class>
     <class name="Input" cname="GtkInput_">
       <method name="AddFull" cname="gtk_input_add_full" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="gint" name="source"/>
-          <parameter type="GdkInputCondition" name="condition"/>
-          <parameter type="GdkInputFunction" name="function"/>
-          <parameter type="GtkCallbackMarshal" name="marshal"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="gint" name="source" />
+          <parameter type="GdkInputCondition" name="condition" />
+          <parameter type="GdkInputFunction" name="function" />
+          <parameter type="GtkCallbackMarshal" name="marshal" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_input_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="input_handler_id"/>
+          <parameter type="guint" name="input_handler_id" />
         </parameters>
       </method>
     </class>
     <class name="Key" cname="GtkKey_">
       <method name="SnooperInstall" cname="gtk_key_snooper_install" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GtkKeySnoopFunc" name="snooper"/>
-          <parameter type="gpointer" name="func_data"/>
+          <parameter type="GtkKeySnoopFunc" name="snooper" />
+          <parameter type="gpointer" name="func_data" />
         </parameters>
       </method>
       <method name="SnooperRemove" cname="gtk_key_snooper_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="snooper_handler_id"/>
+          <parameter type="guint" name="snooper_handler_id" />
         </parameters>
       </method>
     </class>
     <class name="Main" cname="GtkMain_">
       <method name="DoEvent" cname="gtk_main_do_event" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GdkEvent*" name="event"/>
+          <parameter type="GdkEvent*" name="event" />
         </parameters>
       </method>
       <method name="Iteration" cname="gtk_main_iteration" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="IterationDo" cname="gtk_main_iteration_do" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="gboolean" name="blocking"/>
+          <parameter type="gboolean" name="blocking" />
         </parameters>
       </method>
       <method name="Level" cname="gtk_main_level" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="Quit" cname="gtk_main_quit" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </class>
     <class name="Paint" cname="GtkPaint_">
       <method name="Arrow" cname="gtk_paint_arrow" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="GtkArrowType" name="arrow_type"/>
-          <parameter type="gboolean" name="fill"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="GtkArrowType" name="arrow_type" />
+          <parameter type="gboolean" name="fill" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Box" cname="gtk_paint_box" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="BoxGap" cname="gtk_paint_box_gap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GtkPositionType" name="gap_side"/>
-          <parameter type="gint" name="gap_x"/>
-          <parameter type="gint" name="gap_width"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GtkPositionType" name="gap_side" />
+          <parameter type="gint" name="gap_x" />
+          <parameter type="gint" name="gap_width" />
         </parameters>
       </method>
       <method name="Check" cname="gtk_paint_check" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Diamond" cname="gtk_paint_diamond" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Expander" cname="gtk_paint_expander" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="GtkExpanderStyle" name="expander_style"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="GtkExpanderStyle" name="expander_style" />
         </parameters>
       </method>
       <method name="Extension" cname="gtk_paint_extension" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GtkPositionType" name="gap_side"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GtkPositionType" name="gap_side" />
         </parameters>
       </method>
       <method name="FlatBox" cname="gtk_paint_flat_box" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Focus" cname="gtk_paint_focus" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Handle" cname="gtk_paint_handle" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GtkOrientation" name="orientation"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GtkOrientation" name="orientation" />
         </parameters>
       </method>
       <method name="Hline" cname="gtk_paint_hline" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x1"/>
-          <parameter type="gint" name="x2"/>
-          <parameter type="gint" name="y"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x1" />
+          <parameter type="gint" name="x2" />
+          <parameter type="gint" name="y" />
         </parameters>
       </method>
       <method name="Layout" cname="gtk_paint_layout" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="gboolean" name="use_text"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="PangoLayout*" name="layout"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="gboolean" name="use_text" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="PangoLayout*" name="layout" />
         </parameters>
       </method>
       <method name="Option" cname="gtk_paint_option" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Polygon" cname="gtk_paint_polygon" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="GdkPoint*" name="points"/>
-          <parameter type="gint" name="npoints"/>
-          <parameter type="gboolean" name="fill"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="GdkPoint*" name="points" />
+          <parameter type="gint" name="npoints" />
+          <parameter type="gboolean" name="fill" />
         </parameters>
       </method>
       <method name="ResizeGrip" cname="gtk_paint_resize_grip" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="GdkWindowEdge" name="edge"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="GdkWindowEdge" name="edge" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Shadow" cname="gtk_paint_shadow" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="ShadowGap" cname="gtk_paint_shadow_gap" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GtkPositionType" name="gap_side"/>
-          <parameter type="gint" name="gap_x"/>
-          <parameter type="gint" name="gap_width"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GtkPositionType" name="gap_side" />
+          <parameter type="gint" name="gap_x" />
+          <parameter type="gint" name="gap_width" />
         </parameters>
       </method>
       <method name="Slider" cname="gtk_paint_slider" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GtkOrientation" name="orientation"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GtkOrientation" name="orientation" />
         </parameters>
       </method>
       <method name="Tab" cname="gtk_paint_tab" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
         </parameters>
       </method>
       <method name="Vline" cname="gtk_paint_vline" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GtkStateType" name="state_type"/>
-          <parameter type="GdkRectangle*" name="area"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="detail"/>
-          <parameter type="gint" name="y1_"/>
-          <parameter type="gint" name="y2_"/>
-          <parameter type="gint" name="x"/>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="y1_" />
+          <parameter type="gint" name="y2_" />
+          <parameter type="gint" name="x" />
         </parameters>
       </method>
     </class>
     <class name="Quit" cname="GtkQuit_">
       <method name="Add" cname="gtk_quit_add" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint" name="main_level"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="guint" name="main_level" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="AddDestroy" cname="gtk_quit_add_destroy" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="main_level"/>
-          <parameter type="GtkObject*" name="object"/>
+          <parameter type="guint" name="main_level" />
+          <parameter type="GtkObject*" name="object" />
         </parameters>
       </method>
       <method name="AddFull" cname="gtk_quit_add_full" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint" name="main_level"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="GtkCallbackMarshal" name="marshal"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="guint" name="main_level" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="GtkCallbackMarshal" name="marshal" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_quit_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="quit_handler_id"/>
+          <parameter type="guint" name="quit_handler_id" />
         </parameters>
       </method>
       <method name="RemoveByData" cname="gtk_quit_remove_by_data" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
     </class>
     <class name="Rc" cname="GtkRc_">
       <method name="AddDefaultFile" cname="gtk_rc_add_default_file" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="FindModuleInPath" cname="gtk_rc_find_module_in_path" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="const-gchar*" name="module_file"/>
+          <parameter type="const-gchar*" name="module_file" />
         </parameters>
       </method>
       <method name="FindPixmapInPath" cname="gtk_rc_find_pixmap_in_path" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
         <parameters>
-          <parameter type="GtkSettings*" name="settings"/>
-          <parameter type="GScanner*" name="scanner"/>
-          <parameter type="const-gchar*" name="pixmap_file"/>
+          <parameter type="GtkSettings*" name="settings" />
+          <parameter type="GScanner*" name="scanner" />
+          <parameter type="const-gchar*" name="pixmap_file" />
         </parameters>
       </method>
       <method name="GetDefaultFiles" cname="gtk_rc_get_default_files" shared="true">
-        <return-type type="gchar**"/>
+        <return-type type="gchar**" />
       </method>
       <method name="GetImModuleFile" cname="gtk_rc_get_im_module_file" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetImModulePath" cname="gtk_rc_get_im_module_path" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetModuleDir" cname="gtk_rc_get_module_dir" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="GetStyle" cname="gtk_rc_get_style" shared="true">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
       <method name="GetStyleByPaths" cname="gtk_rc_get_style_by_paths" shared="true">
-        <return-type type="GtkStyle*"/>
+        <return-type type="GtkStyle*" />
         <parameters>
-          <parameter type="GtkSettings*" name="settings"/>
-          <parameter type="const-char*" name="widget_path"/>
-          <parameter type="const-char*" name="class_path"/>
-          <parameter type="GType" name="type"/>
+          <parameter type="GtkSettings*" name="settings" />
+          <parameter type="const-char*" name="widget_path" />
+          <parameter type="const-char*" name="class_path" />
+          <parameter type="GType" name="type" />
         </parameters>
       </method>
       <method name="GetThemeDir" cname="gtk_rc_get_theme_dir" shared="true">
-        <return-type type="gchar*"/>
+        <return-type type="gchar*" />
       </method>
       <method name="Parse" cname="gtk_rc_parse" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="filename"/>
+          <parameter type="const-gchar*" name="filename" />
         </parameters>
       </method>
       <method name="ParseColor" cname="gtk_rc_parse_color" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GScanner*" name="scanner"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GScanner*" name="scanner" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </method>
       <method name="ParsePriority" cname="gtk_rc_parse_priority" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GScanner*" name="scanner"/>
-          <parameter type="GtkPathPriorityType*" name="priority"/>
+          <parameter type="GScanner*" name="scanner" />
+          <parameter type="GtkPathPriorityType*" name="priority" />
         </parameters>
       </method>
       <method name="ParseState" cname="gtk_rc_parse_state" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="GScanner*" name="scanner"/>
-          <parameter type="GtkStateType*" name="state"/>
+          <parameter type="GScanner*" name="scanner" />
+          <parameter type="GtkStateType*" name="state" />
         </parameters>
       </method>
       <method name="ParseString" cname="gtk_rc_parse_string" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="rc_string"/>
+          <parameter type="const-gchar*" name="rc_string" />
         </parameters>
       </method>
       <method name="ReparseAll" cname="gtk_rc_reparse_all" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ReparseAllForSettings" cname="gtk_rc_reparse_all_for_settings" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkSettings*" name="settings"/>
-          <parameter type="gboolean" name="force_load"/>
+          <parameter type="GtkSettings*" name="settings" />
+          <parameter type="gboolean" name="force_load" />
         </parameters>
       </method>
       <method name="ScannerNew" cname="gtk_rc_scanner_new" shared="true">
-        <return-type type="GScanner*"/>
+        <return-type type="GScanner*" />
       </method>
       <method name="SetDefaultFiles" cname="gtk_rc_set_default_files" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gchar**" name="filenames"/>
+          <parameter type="gchar**" name="filenames" />
         </parameters>
       </method>
     </class>
     <class name="Selection" cname="GtkSelection_">
       <method name="AddTarget" cname="gtk_selection_add_target" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="guint" name="info"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="guint" name="info" />
         </parameters>
       </method>
       <method name="AddTargets" cname="gtk_selection_add_targets" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="ntargets"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="const-GtkTargetEntry*" name="targets" />
+          <parameter type="guint" name="ntargets" />
         </parameters>
       </method>
       <method name="Clear" cname="gtk_selection_clear" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkEventSelection*" name="event"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </method>
       <method name="ClearTargets" cname="gtk_selection_clear_targets" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
         </parameters>
       </method>
       <method name="Convert" cname="gtk_selection_convert" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="GdkAtom" name="target" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="OwnerSet" cname="gtk_selection_owner_set" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="OwnerSetForDisplay" cname="gtk_selection_owner_set_for_display" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GdkDisplay*" name="display"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="guint32" name="time_"/>
+          <parameter type="GdkDisplay*" name="display" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="guint32" name="time_" />
         </parameters>
       </method>
       <method name="RemoveAll" cname="gtk_selection_remove_all" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </method>
     </class>
     <class name="StockManager" cname="GtkStock_">
       <method name="Add" cname="gtk_stock_add" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkStockItem*" name="items"/>
-          <parameter type="guint" name="n_items"/>
+          <parameter type="const-GtkStockItem*" name="items" />
+          <parameter type="guint" name="n_items" />
         </parameters>
       </method>
       <method name="AddStatic" cname="gtk_stock_add_static" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-GtkStockItem*" name="items"/>
-          <parameter type="guint" name="n_items"/>
+          <parameter type="const-GtkStockItem*" name="items" />
+          <parameter type="guint" name="n_items" />
         </parameters>
       </method>
       <method name="ListIds" cname="gtk_stock_list_ids" shared="true">
-        <return-type type="GSList*"/>
+        <return-type type="GSList*" />
       </method>
       <method name="Lookup" cname="gtk_stock_lookup" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkStockItem*" name="item"/>
+          <parameter type="const-gchar*" name="stock_id" />
+          <parameter type="GtkStockItem*" name="item" />
         </parameters>
       </method>
     </class>
     <class name="Submenu" cname="GtkSubmenu_">
       <method name="DirectionGetType" cname="gtk_submenu_direction_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
       <method name="PlacementGetType" cname="gtk_submenu_placement_get_type" shared="true">
-        <return-type type="GType"/>
+        <return-type type="GType" />
       </method>
     </class>
     <class name="Text" cname="GtkText_">
       <method name="ByteBeginsUtf8Char" cname="gtk_text_byte_begins_utf8_char" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="byte"/>
+          <parameter type="const-gchar*" name="byte" />
         </parameters>
       </method>
       <method name="LayoutDraw" cname="gtk_text_layout_draw" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkTextLayout*" name="layout"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkDrawable*" name="drawable"/>
-          <parameter type="GdkGC*" name="cursor_gc"/>
-          <parameter type="gint" name="x_offset"/>
-          <parameter type="gint" name="y_offset"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-          <parameter type="GList**" name="widgets"/>
+          <parameter type="GtkTextLayout*" name="layout" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="GdkDrawable*" name="drawable" />
+          <parameter type="GdkGC*" name="cursor_gc" />
+          <parameter type="gint" name="x_offset" />
+          <parameter type="gint" name="y_offset" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+          <parameter type="GList**" name="widgets" />
         </parameters>
       </method>
     </class>
     <class name="Timeout" cname="GtkTimeout_">
       <method name="Add" cname="gtk_timeout_add" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint32" name="interval"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="guint32" name="interval" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="AddFull" cname="gtk_timeout_add_full" shared="true">
-        <return-type type="guint"/>
+        <return-type type="guint" />
         <parameters>
-          <parameter type="guint32" name="interval"/>
-          <parameter type="GtkFunction" name="function"/>
-          <parameter type="GtkCallbackMarshal" name="marshal"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="guint32" name="interval" />
+          <parameter type="GtkFunction" name="function" />
+          <parameter type="GtkCallbackMarshal" name="marshal" />
+          <parameter type="gpointer" name="data" />
+          <parameter type="GtkDestroyNotify" name="destroy" />
         </parameters>
       </method>
       <method name="Remove" cname="gtk_timeout_remove" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="guint" name="timeout_handler_id"/>
+          <parameter type="guint" name="timeout_handler_id" />
         </parameters>
       </method>
     </class>
     <class name="Tree" cname="GtkTree_">
       <method name="GetRowDragData" cname="gtk_tree_get_row_drag_data" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="GtkTreeModel**" name="tree_model"/>
-          <parameter type="GtkTreePath**" name="path"/>
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="GtkTreeModel**" name="tree_model" />
+          <parameter type="GtkTreePath**" name="path" />
         </parameters>
       </method>
       <method name="SetRowDragData" cname="gtk_tree_set_row_drag_data" shared="true">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkSelectionData*" name="selection_data"/>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkSelectionData*" name="selection_data" />
+          <parameter type="GtkTreeModel*" name="tree_model" />
+          <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </method>
     </class>
     <object name="Stock" cname="GtkStock">
-      <static-string cname="GTK_STOCK_ADD" name="Add" value="gtk-add"/>
-      <static-string cname="GTK_STOCK_APPLY" name="Apply" value="gtk-apply"/>
-      <static-string cname="GTK_STOCK_BOLD" name="Bold" value="gtk-bold"/>
-      <static-string cname="GTK_STOCK_CANCEL" name="Cancel" value="gtk-cancel"/>
-      <static-string cname="GTK_STOCK_CDROM" name="Cdrom" value="gtk-cdrom"/>
-      <static-string cname="GTK_STOCK_CLEAR" name="Clear" value="gtk-clear"/>
-      <static-string cname="GTK_STOCK_CLOSE" name="Close" value="gtk-close"/>
-      <static-string cname="GTK_STOCK_COLOR_PICKER" name="ColorPicker" value="gtk-color-picker"/>
-      <static-string cname="GTK_STOCK_CONVERT" name="Convert" value="gtk-convert"/>
-      <static-string cname="GTK_STOCK_COPY" name="Copy" value="gtk-copy"/>
-      <static-string cname="GTK_STOCK_CUT" name="Cut" value="gtk-cut"/>
-      <static-string cname="GTK_STOCK_DELETE" name="Delete" value="gtk-delete"/>
-      <static-string cname="GTK_STOCK_DIALOG_ERROR" name="DialogError" value="gtk-dialog-error"/>
-      <static-string cname="GTK_STOCK_DIALOG_INFO" name="DialogInfo" value="gtk-dialog-info"/>
-      <static-string cname="GTK_STOCK_DIALOG_QUESTION" name="DialogQuestion" value="gtk-dialog-question"/>
-      <static-string cname="GTK_STOCK_DIALOG_WARNING" name="DialogWarning" value="gtk-dialog-warning"/>
-      <static-string cname="GTK_STOCK_DND" name="Dnd" value="gtk-dnd"/>
-      <static-string cname="GTK_STOCK_DND_MULTIPLE" name="DndMultiple" value="gtk-dnd-multiple"/>
-      <static-string cname="GTK_STOCK_EXECUTE" name="Execute" value="gtk-execute"/>
-      <static-string cname="GTK_STOCK_FIND" name="Find" value="gtk-find"/>
-      <static-string cname="GTK_STOCK_FIND_AND_REPLACE" name="FindAndReplace" value="gtk-find-and-replace"/>
-      <static-string cname="GTK_STOCK_FLOPPY" name="Floppy" value="gtk-floppy"/>
-      <static-string cname="GTK_STOCK_GOTO_BOTTOM" name="GotoBottom" value="gtk-goto-bottom"/>
-      <static-string cname="GTK_STOCK_GOTO_FIRST" name="GotoFirst" value="gtk-goto-first"/>
-      <static-string cname="GTK_STOCK_GOTO_LAST" name="GotoLast" value="gtk-goto-last"/>
-      <static-string cname="GTK_STOCK_GOTO_TOP" name="GotoTop" value="gtk-goto-top"/>
-      <static-string cname="GTK_STOCK_GO_BACK" name="GoBack" value="gtk-go-back"/>
-      <static-string cname="GTK_STOCK_GO_DOWN" name="GoDown" value="gtk-go-down"/>
-      <static-string cname="GTK_STOCK_GO_FORWARD" name="GoForward" value="gtk-go-forward"/>
-      <static-string cname="GTK_STOCK_GO_UP" name="GoUp" value="gtk-go-up"/>
-      <static-string cname="GTK_STOCK_HELP" name="Help" value="gtk-help"/>
-      <static-string cname="GTK_STOCK_HOME" name="Home" value="gtk-home"/>
-      <static-string cname="GTK_STOCK_INDEX" name="Index" value="gtk-index"/>
-      <static-string cname="GTK_STOCK_ITALIC" name="Italic" value="gtk-italic"/>
-      <static-string cname="GTK_STOCK_JUMP_TO" name="JumpTo" value="gtk-jump-to"/>
-      <static-string cname="GTK_STOCK_JUSTIFY_CENTER" name="JustifyCenter" value="gtk-justify-center"/>
-      <static-string cname="GTK_STOCK_JUSTIFY_FILL" name="JustifyFill" value="gtk-justify-fill"/>
-      <static-string cname="GTK_STOCK_JUSTIFY_LEFT" name="JustifyLeft" value="gtk-justify-left"/>
-      <static-string cname="GTK_STOCK_JUSTIFY_RIGHT" name="JustifyRight" value="gtk-justify-right"/>
-      <static-string cname="GTK_STOCK_MISSING_IMAGE" name="MissingImage" value="gtk-missing-image"/>
-      <static-string cname="GTK_STOCK_NEW" name="New" value="gtk-new"/>
-      <static-string cname="GTK_STOCK_NO" name="No" value="gtk-no"/>
-      <static-string cname="GTK_STOCK_OK" name="Ok" value="gtk-ok"/>
-      <static-string cname="GTK_STOCK_OPEN" name="Open" value="gtk-open"/>
-      <static-string cname="GTK_STOCK_PASTE" name="Paste" value="gtk-paste"/>
-      <static-string cname="GTK_STOCK_PREFERENCES" name="Preferences" value="gtk-preferences"/>
-      <static-string cname="GTK_STOCK_PRINT" name="Print" value="gtk-print"/>
-      <static-string cname="GTK_STOCK_PRINT_PREVIEW" name="PrintPreview" value="gtk-print-preview"/>
-      <static-string cname="GTK_STOCK_PROPERTIES" name="Properties" value="gtk-properties"/>
-      <static-string cname="GTK_STOCK_QUIT" name="Quit" value="gtk-quit"/>
-      <static-string cname="GTK_STOCK_REDO" name="Redo" value="gtk-redo"/>
-      <static-string cname="GTK_STOCK_REFRESH" name="Refresh" value="gtk-refresh"/>
-      <static-string cname="GTK_STOCK_REMOVE" name="Remove" value="gtk-remove"/>
-      <static-string cname="GTK_STOCK_REVERT_TO_SAVED" name="RevertToSaved" value="gtk-revert-to-saved"/>
-      <static-string cname="GTK_STOCK_SAVE" name="Save" value="gtk-save"/>
-      <static-string cname="GTK_STOCK_SAVE_AS" name="SaveAs" value="gtk-save-as"/>
-      <static-string cname="GTK_STOCK_SELECT_COLOR" name="SelectColor" value="gtk-select-color"/>
-      <static-string cname="GTK_STOCK_SELECT_FONT" name="SelectFont" value="gtk-select-font"/>
-      <static-string cname="GTK_STOCK_SORT_ASCENDING" name="SortAscending" value="gtk-sort-ascending"/>
-      <static-string cname="GTK_STOCK_SORT_DESCENDING" name="SortDescending" value="gtk-sort-descending"/>
-      <static-string cname="GTK_STOCK_SPELL_CHECK" name="SpellCheck" value="gtk-spell-check"/>
-      <static-string cname="GTK_STOCK_STOP" name="Stop" value="gtk-stop"/>
-      <static-string cname="GTK_STOCK_STRIKETHROUGH" name="Strikethrough" value="gtk-strikethrough"/>
-      <static-string cname="GTK_STOCK_UNDELETE" name="Undelete" value="gtk-undelete"/>
-      <static-string cname="GTK_STOCK_UNDERLINE" name="Underline" value="gtk-underline"/>
-      <static-string cname="GTK_STOCK_UNDO" name="Undo" value="gtk-undo"/>
-      <static-string cname="GTK_STOCK_YES" name="Yes" value="gtk-yes"/>
-      <static-string cname="GTK_STOCK_ZOOM_100" name="Zoom100" value="gtk-zoom-100"/>
-      <static-string cname="GTK_STOCK_ZOOM_FIT" name="ZoomFit" value="gtk-zoom-fit"/>
-      <static-string cname="GTK_STOCK_ZOOM_IN" name="ZoomIn" value="gtk-zoom-in"/>
-      <static-string cname="GTK_STOCK_ZOOM_OUT" name="ZoomOut" value="gtk-zoom-out"/>
+      <static-string cname="GTK_STOCK_ADD" name="Add" value="gtk-add" />
+      <static-string cname="GTK_STOCK_APPLY" name="Apply" value="gtk-apply" />
+      <static-string cname="GTK_STOCK_BOLD" name="Bold" value="gtk-bold" />
+      <static-string cname="GTK_STOCK_CANCEL" name="Cancel" value="gtk-cancel" />
+      <static-string cname="GTK_STOCK_CDROM" name="Cdrom" value="gtk-cdrom" />
+      <static-string cname="GTK_STOCK_CLEAR" name="Clear" value="gtk-clear" />
+      <static-string cname="GTK_STOCK_CLOSE" name="Close" value="gtk-close" />
+      <static-string cname="GTK_STOCK_COLOR_PICKER" name="ColorPicker" value="gtk-color-picker" />
+      <static-string cname="GTK_STOCK_CONVERT" name="Convert" value="gtk-convert" />
+      <static-string cname="GTK_STOCK_COPY" name="Copy" value="gtk-copy" />
+      <static-string cname="GTK_STOCK_CUT" name="Cut" value="gtk-cut" />
+      <static-string cname="GTK_STOCK_DELETE" name="Delete" value="gtk-delete" />
+      <static-string cname="GTK_STOCK_DIALOG_ERROR" name="DialogError" value="gtk-dialog-error" />
+      <static-string cname="GTK_STOCK_DIALOG_INFO" name="DialogInfo" value="gtk-dialog-info" />
+      <static-string cname="GTK_STOCK_DIALOG_QUESTION" name="DialogQuestion" value="gtk-dialog-question" />
+      <static-string cname="GTK_STOCK_DIALOG_WARNING" name="DialogWarning" value="gtk-dialog-warning" />
+      <static-string cname="GTK_STOCK_DND" name="Dnd" value="gtk-dnd" />
+      <static-string cname="GTK_STOCK_DND_MULTIPLE" name="DndMultiple" value="gtk-dnd-multiple" />
+      <static-string cname="GTK_STOCK_EXECUTE" name="Execute" value="gtk-execute" />
+      <static-string cname="GTK_STOCK_FIND" name="Find" value="gtk-find" />
+      <static-string cname="GTK_STOCK_FIND_AND_REPLACE" name="FindAndReplace" value="gtk-find-and-replace" />
+      <static-string cname="GTK_STOCK_FLOPPY" name="Floppy" value="gtk-floppy" />
+      <static-string cname="GTK_STOCK_GOTO_BOTTOM" name="GotoBottom" value="gtk-goto-bottom" />
+      <static-string cname="GTK_STOCK_GOTO_FIRST" name="GotoFirst" value="gtk-goto-first" />
+      <static-string cname="GTK_STOCK_GOTO_LAST" name="GotoLast" value="gtk-goto-last" />
+      <static-string cname="GTK_STOCK_GOTO_TOP" name="GotoTop" value="gtk-goto-top" />
+      <static-string cname="GTK_STOCK_GO_BACK" name="GoBack" value="gtk-go-back" />
+      <static-string cname="GTK_STOCK_GO_DOWN" name="GoDown" value="gtk-go-down" />
+      <static-string cname="GTK_STOCK_GO_FORWARD" name="GoForward" value="gtk-go-forward" />
+      <static-string cname="GTK_STOCK_GO_UP" name="GoUp" value="gtk-go-up" />
+      <static-string cname="GTK_STOCK_HELP" name="Help" value="gtk-help" />
+      <static-string cname="GTK_STOCK_HOME" name="Home" value="gtk-home" />
+      <static-string cname="GTK_STOCK_INDEX" name="Index" value="gtk-index" />
+      <static-string cname="GTK_STOCK_ITALIC" name="Italic" value="gtk-italic" />
+      <static-string cname="GTK_STOCK_JUMP_TO" name="JumpTo" value="gtk-jump-to" />
+      <static-string cname="GTK_STOCK_JUSTIFY_CENTER" name="JustifyCenter" value="gtk-justify-center" />
+      <static-string cname="GTK_STOCK_JUSTIFY_FILL" name="JustifyFill" value="gtk-justify-fill" />
+      <static-string cname="GTK_STOCK_JUSTIFY_LEFT" name="JustifyLeft" value="gtk-justify-left" />
+      <static-string cname="GTK_STOCK_JUSTIFY_RIGHT" name="JustifyRight" value="gtk-justify-right" />
+      <static-string cname="GTK_STOCK_MISSING_IMAGE" name="MissingImage" value="gtk-missing-image" />
+      <static-string cname="GTK_STOCK_NEW" name="New" value="gtk-new" />
+      <static-string cname="GTK_STOCK_NO" name="No" value="gtk-no" />
+      <static-string cname="GTK_STOCK_OK" name="Ok" value="gtk-ok" />
+      <static-string cname="GTK_STOCK_OPEN" name="Open" value="gtk-open" />
+      <static-string cname="GTK_STOCK_PASTE" name="Paste" value="gtk-paste" />
+      <static-string cname="GTK_STOCK_PREFERENCES" name="Preferences" value="gtk-preferences" />
+      <static-string cname="GTK_STOCK_PRINT" name="Print" value="gtk-print" />
+      <static-string cname="GTK_STOCK_PRINT_PREVIEW" name="PrintPreview" value="gtk-print-preview" />
+      <static-string cname="GTK_STOCK_PROPERTIES" name="Properties" value="gtk-properties" />
+      <static-string cname="GTK_STOCK_QUIT" name="Quit" value="gtk-quit" />
+      <static-string cname="GTK_STOCK_REDO" name="Redo" value="gtk-redo" />
+      <static-string cname="GTK_STOCK_REFRESH" name="Refresh" value="gtk-refresh" />
+      <static-string cname="GTK_STOCK_REMOVE" name="Remove" value="gtk-remove" />
+      <static-string cname="GTK_STOCK_REVERT_TO_SAVED" name="RevertToSaved" value="gtk-revert-to-saved" />
+      <static-string cname="GTK_STOCK_SAVE" name="Save" value="gtk-save" />
+      <static-string cname="GTK_STOCK_SAVE_AS" name="SaveAs" value="gtk-save-as" />
+      <static-string cname="GTK_STOCK_SELECT_COLOR" name="SelectColor" value="gtk-select-color" />
+      <static-string cname="GTK_STOCK_SELECT_FONT" name="SelectFont" value="gtk-select-font" />
+      <static-string cname="GTK_STOCK_SORT_ASCENDING" name="SortAscending" value="gtk-sort-ascending" />
+      <static-string cname="GTK_STOCK_SORT_DESCENDING" name="SortDescending" value="gtk-sort-descending" />
+      <static-string cname="GTK_STOCK_SPELL_CHECK" name="SpellCheck" value="gtk-spell-check" />
+      <static-string cname="GTK_STOCK_STOP" name="Stop" value="gtk-stop" />
+      <static-string cname="GTK_STOCK_STRIKETHROUGH" name="Strikethrough" value="gtk-strikethrough" />
+      <static-string cname="GTK_STOCK_UNDELETE" name="Undelete" value="gtk-undelete" />
+      <static-string cname="GTK_STOCK_UNDERLINE" name="Underline" value="gtk-underline" />
+      <static-string cname="GTK_STOCK_UNDO" name="Undo" value="gtk-undo" />
+      <static-string cname="GTK_STOCK_YES" name="Yes" value="gtk-yes" />
+      <static-string cname="GTK_STOCK_ZOOM_100" name="Zoom100" value="gtk-zoom-100" />
+      <static-string cname="GTK_STOCK_ZOOM_FIT" name="ZoomFit" value="gtk-zoom-fit" />
+      <static-string cname="GTK_STOCK_ZOOM_IN" name="ZoomIn" value="gtk-zoom-in" />
+      <static-string cname="GTK_STOCK_ZOOM_OUT" name="ZoomOut" value="gtk-zoom-out" />
     </object>
   </namespace>
-</api>
+</api>
\ No newline at end of file
diff --git a/gtkhtml/Gtk.metadata b/gtkhtml/Gtk.metadata
new file mode 100644
index 000000000..a8e0f3048
--- /dev/null
+++ b/gtkhtml/Gtk.metadata
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="type">const-guchar*</attr>
+  <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="array">1</attr>
+</metadata>
+
+
diff --git a/gtkhtml/Makefile.in b/gtkhtml/Makefile.in
index b89ed7745..83b961152 100755
--- a/gtkhtml/Makefile.in
+++ b/gtkhtml/Makefile.in
@@ -14,7 +14,8 @@ ASSEMBLY=gtkhtml-sharp.dll
 
 all: $(ASSEMBLY)
 
-generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe
+generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.metadata
+	$(RUNTIME) ../parser/gapi-fixup.exe --api=gtkhtml-api.xml --metadata=Gtk.metadata && \
 	$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS)	\
 	--include $(INCLUDE_APIS) --outdir=generated --customdir=. 	\
 	--assembly-name=gtkhtml-sharp && touch generated-stamp
diff --git a/gtkhtml/gtkhtml-api.xml b/gtkhtml/gtkhtml-api.xml
index d2350809c..5e103724b 100644
--- a/gtkhtml/gtkhtml-api.xml
+++ b/gtkhtml/gtkhtml-api.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<api>
-<!--
+<api><!--
 
         This file was automatically generated.
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@@ -8,962 +7,962 @@
 -->
   <namespace name="Gtk" library="gtkhtml-3.0">
     <enum name="HTMLBeginFlags" cname="GtkHTMLBeginFlags" type="flags">
-      <member cname="GTK_HTML_BEGIN_KEEP_SCROLL" name="Scroll" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_HTML_BEGIN_KEEP_IMAGES" name="Images" value="1 &lt;&lt; 1"/>
+      <member cname="GTK_HTML_BEGIN_KEEP_SCROLL" name="Scroll" value="1 &lt;&lt; 0" />
+      <member cname="GTK_HTML_BEGIN_KEEP_IMAGES" name="Images" value="1 &lt;&lt; 1" />
     </enum>
     <enum name="HTMLCommandType" cname="GtkHTMLCommandType" type="enum">
-      <member cname="GTK_HTML_COMMAND_UNDO" name="Undo"/>
-      <member cname="GTK_HTML_COMMAND_REDO" name="Redo"/>
-      <member cname="GTK_HTML_COMMAND_COPY" name="Copy"/>
-      <member cname="GTK_HTML_COMMAND_COPY_AND_DISABLE_SELECTION" name="CopyAndDisableSelection"/>
-      <member cname="GTK_HTML_COMMAND_CUT" name="Cut"/>
-      <member cname="GTK_HTML_COMMAND_PASTE" name="Paste"/>
-      <member cname="GTK_HTML_COMMAND_CUT_LINE" name="CutLine"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_PARAGRAPH" name="InsertParagraph"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_TAB" name="InsertTab"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_RULE" name="InsertRule"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_RULE_PARAM" name="InsertRuleParam"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_IMAGE_PARAM" name="InsertImageParam"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_TAB_OR_INDENT_MORE" name="InsertTabOrIndentMore"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_TAB_OR_NEXT_CELL" name="InsertTabOrNextCell"/>
-      <member cname="GTK_HTML_COMMAND_MAKE_LINK" name="MakeLink"/>
-      <member cname="GTK_HTML_COMMAND_REMOVE_LINK" name="RemoveLink"/>
-      <member cname="GTK_HTML_COMMAND_DELETE" name="Delete"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_BACK" name="DeleteBack"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_BACK_OR_INDENT_DEC" name="DeleteBackOrIndentDec"/>
-      <member cname="GTK_HTML_COMMAND_SELECTION_MODE" name="SelectionMode"/>
-      <member cname="GTK_HTML_COMMAND_DISABLE_SELECTION" name="DisableSelection"/>
-      <member cname="GTK_HTML_COMMAND_BOLD_ON" name="BoldOn"/>
-      <member cname="GTK_HTML_COMMAND_BOLD_OFF" name="BoldOff"/>
-      <member cname="GTK_HTML_COMMAND_BOLD_TOGGLE" name="BoldToggle"/>
-      <member cname="GTK_HTML_COMMAND_ITALIC_ON" name="ItalicOn"/>
-      <member cname="GTK_HTML_COMMAND_ITALIC_OFF" name="ItalicOff"/>
-      <member cname="GTK_HTML_COMMAND_ITALIC_TOGGLE" name="ItalicToggle"/>
-      <member cname="GTK_HTML_COMMAND_UNDERLINE_ON" name="UnderlineOn"/>
-      <member cname="GTK_HTML_COMMAND_UNDERLINE_OFF" name="UnderlineOff"/>
-      <member cname="GTK_HTML_COMMAND_UNDERLINE_TOGGLE" name="UnderlineToggle"/>
-      <member cname="GTK_HTML_COMMAND_STRIKEOUT_ON" name="StrikeoutOn"/>
-      <member cname="GTK_HTML_COMMAND_STRIKEOUT_OFF" name="StrikeoutOff"/>
-      <member cname="GTK_HTML_COMMAND_STRIKEOUT_TOGGLE" name="StrikeoutToggle"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_MINUS_2" name="SizeMinus2"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_MINUS_1" name="SizeMinus1"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_0" name="SizePlus0"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_1" name="SizePlus1"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_2" name="SizePlus2"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_3" name="SizePlus3"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_4" name="SizePlus4"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_INCREASE" name="SizeIncrease"/>
-      <member cname="GTK_HTML_COMMAND_SIZE_DECREASE" name="SizeDecrease"/>
-      <member cname="GTK_HTML_COMMAND_ALIGN_LEFT" name="AlignLeft"/>
-      <member cname="GTK_HTML_COMMAND_ALIGN_CENTER" name="AlignCenter"/>
-      <member cname="GTK_HTML_COMMAND_ALIGN_RIGHT" name="AlignRight"/>
-      <member cname="GTK_HTML_COMMAND_INDENT_ZERO" name="IndentZero"/>
-      <member cname="GTK_HTML_COMMAND_INDENT_INC" name="IndentInc"/>
-      <member cname="GTK_HTML_COMMAND_INDENT_INC_OR_NEXT_CELL" name="IndentIncOrNextCell"/>
-      <member cname="GTK_HTML_COMMAND_INDENT_DEC" name="IndentDec"/>
-      <member cname="GTK_HTML_COMMAND_PREV_CELL" name="PrevCell"/>
-      <member cname="GTK_HTML_COMMAND_INDENT_PARAGRAPH" name="IndentParagraph"/>
-      <member cname="GTK_HTML_COMMAND_BREAK_AND_FILL_LINE" name="BreakAndFillLine"/>
-      <member cname="GTK_HTML_COMMAND_SPACE_AND_FILL_LINE" name="SpaceAndFillLine"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_NORMAL" name="ParagraphStyleNormal"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H1" name="ParagraphStyleH1"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H2" name="ParagraphStyleH2"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H3" name="ParagraphStyleH3"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H4" name="ParagraphStyleH4"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H5" name="ParagraphStyleH5"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H6" name="ParagraphStyleH6"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ADDRESS" name="ParagraphStyleAddress"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_PRE" name="ParagraphStylePre"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMDOTTED" name="ParagraphStyleItemdotted"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMROMAN" name="ParagraphStyleItemroman"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMDIGIT" name="ParagraphStyleItemdigit"/>
-      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMALPHA" name="ParagraphStyleItemalpha"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_UP" name="ModifySelectionUp"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_DOWN" name="ModifySelectionDown"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_LEFT" name="ModifySelectionLeft"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_RIGHT" name="ModifySelectionRight"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PAGEUP" name="ModifySelectionPageup"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PAGEDOWN" name="ModifySelectionPagedown"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_BOL" name="ModifySelectionBol"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_EOL" name="ModifySelectionEol"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_BOD" name="ModifySelectionBod"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_EOD" name="ModifySelectionEod"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PREV_WORD" name="ModifySelectionPrevWord"/>
-      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_NEXT_WORD" name="ModifySelectionNextWord"/>
-      <member cname="GTK_HTML_COMMAND_CAPITALIZE_WORD" name="CapitalizeWord"/>
-      <member cname="GTK_HTML_COMMAND_UPCASE_WORD" name="UpcaseWord"/>
-      <member cname="GTK_HTML_COMMAND_DOWNCASE_WORD" name="DowncaseWord"/>
-      <member cname="GTK_HTML_COMMAND_SPELL_SUGGEST" name="SpellSuggest"/>
-      <member cname="GTK_HTML_COMMAND_SPELL_PERSONAL_DICTIONARY_ADD" name="SpellPersonalDictionaryAdd"/>
-      <member cname="GTK_HTML_COMMAND_SPELL_SESSION_DICTIONARY_ADD" name="SpellSessionDictionaryAdd"/>
-      <member cname="GTK_HTML_COMMAND_SEARCH" name="Search"/>
-      <member cname="GTK_HTML_COMMAND_SEARCH_INCREMENTAL_FORWARD" name="SearchIncrementalForward"/>
-      <member cname="GTK_HTML_COMMAND_SEARCH_INCREMENTAL_BACKWARD" name="SearchIncrementalBackward"/>
-      <member cname="GTK_HTML_COMMAND_SEARCH_REGEX" name="SearchRegex"/>
-      <member cname="GTK_HTML_COMMAND_FOCUS_FORWARD" name="FocusForward"/>
-      <member cname="GTK_HTML_COMMAND_FOCUS_BACKWARD" name="FocusBackward"/>
-      <member cname="GTK_HTML_COMMAND_POPUP_MENU" name="PopupMenu"/>
-      <member cname="GTK_HTML_COMMAND_PROPERTIES_DIALOG" name="PropertiesDialog"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_FORWARD" name="CursorForward"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_BACKWARD" name="CursorBackward"/>
-      <member cname="GTK_HTML_COMMAND_INSERT_TABLE_1_1" name="InsertTable11"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_COL_AFTER" name="TableInsertColAfter"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_COL_BEFORE" name="TableInsertColBefore"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_ROW_AFTER" name="TableInsertRowAfter"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_ROW_BEFORE" name="TableInsertRowBefore"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_DELETE_COL" name="TableDeleteCol"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_DELETE_ROW" name="TableDeleteRow"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_INC_CSPAN" name="TableCellIncCspan"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_DEC_CSPAN" name="TableCellDecCspan"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_INC_RSPAN" name="TableCellIncRspan"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_DEC_RSPAN" name="TableCellDecRspan"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_LEFT" name="TableCellJoinLeft"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_RIGHT" name="TableCellJoinRight"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_UP" name="TableCellJoinUp"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_DOWN" name="TableCellJoinDown"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_INC" name="TableBorderWidthInc"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_DEC" name="TableBorderWidthDec"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_ZERO" name="TableBorderWidthZero"/>
-      <member cname="GTK_HTML_COMMAND_TEXT_SET_DEFAULT_COLOR" name="TextSetDefaultColor"/>
-      <member cname="GTK_HTML_COMMAND_SELECT_WORD" name="SelectWord"/>
-      <member cname="GTK_HTML_COMMAND_SELECT_LINE" name="SelectLine"/>
-      <member cname="GTK_HTML_COMMAND_SELECT_PARAGRAPH" name="SelectParagraph"/>
-      <member cname="GTK_HTML_COMMAND_SELECT_PARAGRAPH_EXTENDED" name="SelectParagraphExtended"/>
-      <member cname="GTK_HTML_COMMAND_SELECT_ALL" name="SelectAll"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_POSITION_SAVE" name="CursorPositionSave"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_POSITION_RESTORE" name="CursorPositionRestore"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_BOD" name="CursorBod"/>
-      <member cname="GTK_HTML_COMMAND_CURSOR_EOD" name="CursorEod"/>
-      <member cname="GTK_HTML_COMMAND_BLOCK_REDRAW" name="BlockRedraw"/>
-      <member cname="GTK_HTML_COMMAND_UNBLOCK_REDRAW" name="UnblockRedraw"/>
-      <member cname="GTK_HTML_COMMAND_ZOOM_IN" name="ZoomIn"/>
-      <member cname="GTK_HTML_COMMAND_ZOOM_OUT" name="ZoomOut"/>
-      <member cname="GTK_HTML_COMMAND_ZOOM_RESET" name="ZoomReset"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_INC" name="TableSpacingInc"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_DEC" name="TableSpacingDec"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_ZERO" name="TableSpacingZero"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_INC" name="TablePaddingInc"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_DEC" name="TablePaddingDec"/>
-      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_ZERO" name="TablePaddingZero"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_TABLE" name="DeleteTable"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_ROW" name="DeleteTableRow"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_COLUMN" name="DeleteTableColumn"/>
-      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_CELL_CONTENTS" name="DeleteTableCellContents"/>
-      <member cname="GTK_HTML_COMMAND_GRAB_FOCUS" name="GrabFocus"/>
-      <member cname="GTK_HTML_COMMAND_KILL_WORD" name="KillWord"/>
-      <member cname="GTK_HTML_COMMAND_KILL_WORD_BACKWARD" name="KillWordBackward"/>
-      <member cname="GTK_HTML_COMMAND_TEXT_COLOR_APPLY" name="TextColorApply"/>
-      <member cname="GTK_HTML_COMMAND_SAVE_DATA_ON" name="SaveDataOn"/>
-      <member cname="GTK_HTML_COMMAND_SAVE_DATA_OFF" name="SaveDataOff"/>
-      <member cname="GTK_HTML_COMMAND_SAVED" name="Saved"/>
-      <member cname="GTK_HTML_COMMAND_IS_SAVED" name="IsSaved"/>
-      <member cname="GTK_HTML_COMMAND_SCROLL_BOD" name="ScrollBod"/>
-      <member cname="GTK_HTML_COMMAND_SCROLL_EOD" name="ScrollEod"/>
-      <member cname="GTK_HTML_COMMAND_CELL_CSPAN_INC" name="CellCspanInc"/>
-      <member cname="GTK_HTML_COMMAND_CELL_RSPAN_INC" name="CellRspanInc"/>
-      <member cname="GTK_HTML_COMMAND_CELL_CSPAN_DEC" name="CellCspanDec"/>
-      <member cname="GTK_HTML_COMMAND_CELL_RSPAN_DEC" name="CellRspanDec"/>
+      <member cname="GTK_HTML_COMMAND_UNDO" name="Undo" />
+      <member cname="GTK_HTML_COMMAND_REDO" name="Redo" />
+      <member cname="GTK_HTML_COMMAND_COPY" name="Copy" />
+      <member cname="GTK_HTML_COMMAND_COPY_AND_DISABLE_SELECTION" name="CopyAndDisableSelection" />
+      <member cname="GTK_HTML_COMMAND_CUT" name="Cut" />
+      <member cname="GTK_HTML_COMMAND_PASTE" name="Paste" />
+      <member cname="GTK_HTML_COMMAND_CUT_LINE" name="CutLine" />
+      <member cname="GTK_HTML_COMMAND_INSERT_PARAGRAPH" name="InsertParagraph" />
+      <member cname="GTK_HTML_COMMAND_INSERT_TAB" name="InsertTab" />
+      <member cname="GTK_HTML_COMMAND_INSERT_RULE" name="InsertRule" />
+      <member cname="GTK_HTML_COMMAND_INSERT_RULE_PARAM" name="InsertRuleParam" />
+      <member cname="GTK_HTML_COMMAND_INSERT_IMAGE_PARAM" name="InsertImageParam" />
+      <member cname="GTK_HTML_COMMAND_INSERT_TAB_OR_INDENT_MORE" name="InsertTabOrIndentMore" />
+      <member cname="GTK_HTML_COMMAND_INSERT_TAB_OR_NEXT_CELL" name="InsertTabOrNextCell" />
+      <member cname="GTK_HTML_COMMAND_MAKE_LINK" name="MakeLink" />
+      <member cname="GTK_HTML_COMMAND_REMOVE_LINK" name="RemoveLink" />
+      <member cname="GTK_HTML_COMMAND_DELETE" name="Delete" />
+      <member cname="GTK_HTML_COMMAND_DELETE_BACK" name="DeleteBack" />
+      <member cname="GTK_HTML_COMMAND_DELETE_BACK_OR_INDENT_DEC" name="DeleteBackOrIndentDec" />
+      <member cname="GTK_HTML_COMMAND_SELECTION_MODE" name="SelectionMode" />
+      <member cname="GTK_HTML_COMMAND_DISABLE_SELECTION" name="DisableSelection" />
+      <member cname="GTK_HTML_COMMAND_BOLD_ON" name="BoldOn" />
+      <member cname="GTK_HTML_COMMAND_BOLD_OFF" name="BoldOff" />
+      <member cname="GTK_HTML_COMMAND_BOLD_TOGGLE" name="BoldToggle" />
+      <member cname="GTK_HTML_COMMAND_ITALIC_ON" name="ItalicOn" />
+      <member cname="GTK_HTML_COMMAND_ITALIC_OFF" name="ItalicOff" />
+      <member cname="GTK_HTML_COMMAND_ITALIC_TOGGLE" name="ItalicToggle" />
+      <member cname="GTK_HTML_COMMAND_UNDERLINE_ON" name="UnderlineOn" />
+      <member cname="GTK_HTML_COMMAND_UNDERLINE_OFF" name="UnderlineOff" />
+      <member cname="GTK_HTML_COMMAND_UNDERLINE_TOGGLE" name="UnderlineToggle" />
+      <member cname="GTK_HTML_COMMAND_STRIKEOUT_ON" name="StrikeoutOn" />
+      <member cname="GTK_HTML_COMMAND_STRIKEOUT_OFF" name="StrikeoutOff" />
+      <member cname="GTK_HTML_COMMAND_STRIKEOUT_TOGGLE" name="StrikeoutToggle" />
+      <member cname="GTK_HTML_COMMAND_SIZE_MINUS_2" name="SizeMinus2" />
+      <member cname="GTK_HTML_COMMAND_SIZE_MINUS_1" name="SizeMinus1" />
+      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_0" name="SizePlus0" />
+      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_1" name="SizePlus1" />
+      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_2" name="SizePlus2" />
+      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_3" name="SizePlus3" />
+      <member cname="GTK_HTML_COMMAND_SIZE_PLUS_4" name="SizePlus4" />
+      <member cname="GTK_HTML_COMMAND_SIZE_INCREASE" name="SizeIncrease" />
+      <member cname="GTK_HTML_COMMAND_SIZE_DECREASE" name="SizeDecrease" />
+      <member cname="GTK_HTML_COMMAND_ALIGN_LEFT" name="AlignLeft" />
+      <member cname="GTK_HTML_COMMAND_ALIGN_CENTER" name="AlignCenter" />
+      <member cname="GTK_HTML_COMMAND_ALIGN_RIGHT" name="AlignRight" />
+      <member cname="GTK_HTML_COMMAND_INDENT_ZERO" name="IndentZero" />
+      <member cname="GTK_HTML_COMMAND_INDENT_INC" name="IndentInc" />
+      <member cname="GTK_HTML_COMMAND_INDENT_INC_OR_NEXT_CELL" name="IndentIncOrNextCell" />
+      <member cname="GTK_HTML_COMMAND_INDENT_DEC" name="IndentDec" />
+      <member cname="GTK_HTML_COMMAND_PREV_CELL" name="PrevCell" />
+      <member cname="GTK_HTML_COMMAND_INDENT_PARAGRAPH" name="IndentParagraph" />
+      <member cname="GTK_HTML_COMMAND_BREAK_AND_FILL_LINE" name="BreakAndFillLine" />
+      <member cname="GTK_HTML_COMMAND_SPACE_AND_FILL_LINE" name="SpaceAndFillLine" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_NORMAL" name="ParagraphStyleNormal" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H1" name="ParagraphStyleH1" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H2" name="ParagraphStyleH2" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H3" name="ParagraphStyleH3" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H4" name="ParagraphStyleH4" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H5" name="ParagraphStyleH5" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_H6" name="ParagraphStyleH6" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ADDRESS" name="ParagraphStyleAddress" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_PRE" name="ParagraphStylePre" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMDOTTED" name="ParagraphStyleItemdotted" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMROMAN" name="ParagraphStyleItemroman" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMDIGIT" name="ParagraphStyleItemdigit" />
+      <member cname="GTK_HTML_COMMAND_PARAGRAPH_STYLE_ITEMALPHA" name="ParagraphStyleItemalpha" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_UP" name="ModifySelectionUp" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_DOWN" name="ModifySelectionDown" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_LEFT" name="ModifySelectionLeft" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_RIGHT" name="ModifySelectionRight" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PAGEUP" name="ModifySelectionPageup" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PAGEDOWN" name="ModifySelectionPagedown" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_BOL" name="ModifySelectionBol" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_EOL" name="ModifySelectionEol" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_BOD" name="ModifySelectionBod" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_EOD" name="ModifySelectionEod" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_PREV_WORD" name="ModifySelectionPrevWord" />
+      <member cname="GTK_HTML_COMMAND_MODIFY_SELECTION_NEXT_WORD" name="ModifySelectionNextWord" />
+      <member cname="GTK_HTML_COMMAND_CAPITALIZE_WORD" name="CapitalizeWord" />
+      <member cname="GTK_HTML_COMMAND_UPCASE_WORD" name="UpcaseWord" />
+      <member cname="GTK_HTML_COMMAND_DOWNCASE_WORD" name="DowncaseWord" />
+      <member cname="GTK_HTML_COMMAND_SPELL_SUGGEST" name="SpellSuggest" />
+      <member cname="GTK_HTML_COMMAND_SPELL_PERSONAL_DICTIONARY_ADD" name="SpellPersonalDictionaryAdd" />
+      <member cname="GTK_HTML_COMMAND_SPELL_SESSION_DICTIONARY_ADD" name="SpellSessionDictionaryAdd" />
+      <member cname="GTK_HTML_COMMAND_SEARCH" name="Search" />
+      <member cname="GTK_HTML_COMMAND_SEARCH_INCREMENTAL_FORWARD" name="SearchIncrementalForward" />
+      <member cname="GTK_HTML_COMMAND_SEARCH_INCREMENTAL_BACKWARD" name="SearchIncrementalBackward" />
+      <member cname="GTK_HTML_COMMAND_SEARCH_REGEX" name="SearchRegex" />
+      <member cname="GTK_HTML_COMMAND_FOCUS_FORWARD" name="FocusForward" />
+      <member cname="GTK_HTML_COMMAND_FOCUS_BACKWARD" name="FocusBackward" />
+      <member cname="GTK_HTML_COMMAND_POPUP_MENU" name="PopupMenu" />
+      <member cname="GTK_HTML_COMMAND_PROPERTIES_DIALOG" name="PropertiesDialog" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_FORWARD" name="CursorForward" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_BACKWARD" name="CursorBackward" />
+      <member cname="GTK_HTML_COMMAND_INSERT_TABLE_1_1" name="InsertTable11" />
+      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_COL_AFTER" name="TableInsertColAfter" />
+      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_COL_BEFORE" name="TableInsertColBefore" />
+      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_ROW_AFTER" name="TableInsertRowAfter" />
+      <member cname="GTK_HTML_COMMAND_TABLE_INSERT_ROW_BEFORE" name="TableInsertRowBefore" />
+      <member cname="GTK_HTML_COMMAND_TABLE_DELETE_COL" name="TableDeleteCol" />
+      <member cname="GTK_HTML_COMMAND_TABLE_DELETE_ROW" name="TableDeleteRow" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_INC_CSPAN" name="TableCellIncCspan" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_DEC_CSPAN" name="TableCellDecCspan" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_INC_RSPAN" name="TableCellIncRspan" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_DEC_RSPAN" name="TableCellDecRspan" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_LEFT" name="TableCellJoinLeft" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_RIGHT" name="TableCellJoinRight" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_UP" name="TableCellJoinUp" />
+      <member cname="GTK_HTML_COMMAND_TABLE_CELL_JOIN_DOWN" name="TableCellJoinDown" />
+      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_INC" name="TableBorderWidthInc" />
+      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_DEC" name="TableBorderWidthDec" />
+      <member cname="GTK_HTML_COMMAND_TABLE_BORDER_WIDTH_ZERO" name="TableBorderWidthZero" />
+      <member cname="GTK_HTML_COMMAND_TEXT_SET_DEFAULT_COLOR" name="TextSetDefaultColor" />
+      <member cname="GTK_HTML_COMMAND_SELECT_WORD" name="SelectWord" />
+      <member cname="GTK_HTML_COMMAND_SELECT_LINE" name="SelectLine" />
+      <member cname="GTK_HTML_COMMAND_SELECT_PARAGRAPH" name="SelectParagraph" />
+      <member cname="GTK_HTML_COMMAND_SELECT_PARAGRAPH_EXTENDED" name="SelectParagraphExtended" />
+      <member cname="GTK_HTML_COMMAND_SELECT_ALL" name="SelectAll" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_POSITION_SAVE" name="CursorPositionSave" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_POSITION_RESTORE" name="CursorPositionRestore" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_BOD" name="CursorBod" />
+      <member cname="GTK_HTML_COMMAND_CURSOR_EOD" name="CursorEod" />
+      <member cname="GTK_HTML_COMMAND_BLOCK_REDRAW" name="BlockRedraw" />
+      <member cname="GTK_HTML_COMMAND_UNBLOCK_REDRAW" name="UnblockRedraw" />
+      <member cname="GTK_HTML_COMMAND_ZOOM_IN" name="ZoomIn" />
+      <member cname="GTK_HTML_COMMAND_ZOOM_OUT" name="ZoomOut" />
+      <member cname="GTK_HTML_COMMAND_ZOOM_RESET" name="ZoomReset" />
+      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_INC" name="TableSpacingInc" />
+      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_DEC" name="TableSpacingDec" />
+      <member cname="GTK_HTML_COMMAND_TABLE_SPACING_ZERO" name="TableSpacingZero" />
+      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_INC" name="TablePaddingInc" />
+      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_DEC" name="TablePaddingDec" />
+      <member cname="GTK_HTML_COMMAND_TABLE_PADDING_ZERO" name="TablePaddingZero" />
+      <member cname="GTK_HTML_COMMAND_DELETE_TABLE" name="DeleteTable" />
+      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_ROW" name="DeleteTableRow" />
+      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_COLUMN" name="DeleteTableColumn" />
+      <member cname="GTK_HTML_COMMAND_DELETE_TABLE_CELL_CONTENTS" name="DeleteTableCellContents" />
+      <member cname="GTK_HTML_COMMAND_GRAB_FOCUS" name="GrabFocus" />
+      <member cname="GTK_HTML_COMMAND_KILL_WORD" name="KillWord" />
+      <member cname="GTK_HTML_COMMAND_KILL_WORD_BACKWARD" name="KillWordBackward" />
+      <member cname="GTK_HTML_COMMAND_TEXT_COLOR_APPLY" name="TextColorApply" />
+      <member cname="GTK_HTML_COMMAND_SAVE_DATA_ON" name="SaveDataOn" />
+      <member cname="GTK_HTML_COMMAND_SAVE_DATA_OFF" name="SaveDataOff" />
+      <member cname="GTK_HTML_COMMAND_SAVED" name="Saved" />
+      <member cname="GTK_HTML_COMMAND_IS_SAVED" name="IsSaved" />
+      <member cname="GTK_HTML_COMMAND_SCROLL_BOD" name="ScrollBod" />
+      <member cname="GTK_HTML_COMMAND_SCROLL_EOD" name="ScrollEod" />
+      <member cname="GTK_HTML_COMMAND_CELL_CSPAN_INC" name="CellCspanInc" />
+      <member cname="GTK_HTML_COMMAND_CELL_RSPAN_INC" name="CellRspanInc" />
+      <member cname="GTK_HTML_COMMAND_CELL_CSPAN_DEC" name="CellCspanDec" />
+      <member cname="GTK_HTML_COMMAND_CELL_RSPAN_DEC" name="CellRspanDec" />
     </enum>
     <enum name="HTMLCursorSkipType" cname="GtkHTMLCursorSkipType" type="enum">
-      <member cname="GTK_HTML_CURSOR_SKIP_ONE" name="One"/>
-      <member cname="GTK_HTML_CURSOR_SKIP_WORD" name="Word"/>
-      <member cname="GTK_HTML_CURSOR_SKIP_PAGE" name="Page"/>
-      <member cname="GTK_HTML_CURSOR_SKIP_ALL" name="All"/>
+      <member cname="GTK_HTML_CURSOR_SKIP_ONE" name="One" />
+      <member cname="GTK_HTML_CURSOR_SKIP_WORD" name="Word" />
+      <member cname="GTK_HTML_CURSOR_SKIP_PAGE" name="Page" />
+      <member cname="GTK_HTML_CURSOR_SKIP_ALL" name="All" />
     </enum>
     <enum name="HTMLEditorEventType" cname="GtkHTMLEditorEventType" type="enum">
-      <member cname="GTK_HTML_EDITOR_EVENT_COMMAND_BEFORE" name="CommandBefore"/>
-      <member cname="GTK_HTML_EDITOR_EVENT_COMMAND_AFTER" name="CommandAfter"/>
-      <member cname="GTK_HTML_EDITOR_EVENT_IMAGE_URL" name="ImageUrl"/>
-      <member cname="GTK_HTML_EDITOR_EVENT_DELETE" name="Delete"/>
+      <member cname="GTK_HTML_EDITOR_EVENT_COMMAND_BEFORE" name="CommandBefore" />
+      <member cname="GTK_HTML_EDITOR_EVENT_COMMAND_AFTER" name="CommandAfter" />
+      <member cname="GTK_HTML_EDITOR_EVENT_IMAGE_URL" name="ImageUrl" />
+      <member cname="GTK_HTML_EDITOR_EVENT_DELETE" name="Delete" />
     </enum>
     <enum name="HTMLEtchStyle" cname="GtkHTMLEtchStyle" type="enum">
-      <member cname="GTK_HTML_ETCH_IN" name="In"/>
-      <member cname="GTK_HTML_ETCH_OUT" name="Out"/>
-      <member cname="GTK_HTML_ETCH_NONE" name="None"/>
+      <member cname="GTK_HTML_ETCH_IN" name="In" />
+      <member cname="GTK_HTML_ETCH_OUT" name="Out" />
+      <member cname="GTK_HTML_ETCH_NONE" name="None" />
     </enum>
     <enum name="HTMLFontStyle" cname="GtkHTMLFontStyle" type="flags">
-      <member cname="GTK_HTML_FONT_STYLE_DEFAULT" name="Default"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_1" name="Size1" value="1"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_2" name="Size2" value="2"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_3" name="Size3" value="3"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_4" name="Size4" value="4"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_5" name="Size5" value="5"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_6" name="Size6" value="6"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_7" name="Size7" value="7"/>
-      <member cname="GTK_HTML_FONT_STYLE_SIZE_MASK" name="SizeMask" value="0x7"/>
-      <member cname="GTK_HTML_FONT_STYLE_BOLD" name="Bold" value="1 &lt;&lt; 3"/>
-      <member cname="GTK_HTML_FONT_STYLE_ITALIC" name="Italic" value="1 &lt;&lt; 4"/>
-      <member cname="GTK_HTML_FONT_STYLE_UNDERLINE" name="Underline" value="1 &lt;&lt; 5"/>
-      <member cname="GTK_HTML_FONT_STYLE_STRIKEOUT" name="Strikeout" value="1 &lt;&lt; 6"/>
-      <member cname="GTK_HTML_FONT_STYLE_FIXED" name="Fixed" value="1 &lt;&lt; 7"/>
-      <member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 &lt;&lt; 8"/>
-      <member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 &lt;&lt; 9"/>
+      <member cname="GTK_HTML_FONT_STYLE_DEFAULT" name="Default" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_1" name="Size1" value="1" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_2" name="Size2" value="2" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_3" name="Size3" value="3" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_4" name="Size4" value="4" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_5" name="Size5" value="5" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_6" name="Size6" value="6" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_7" name="Size7" value="7" />
+      <member cname="GTK_HTML_FONT_STYLE_SIZE_MASK" name="SizeMask" value="0x7" />
+      <member cname="GTK_HTML_FONT_STYLE_BOLD" name="Bold" value="1 &lt;&lt; 3" />
+      <member cname="GTK_HTML_FONT_STYLE_ITALIC" name="Italic" value="1 &lt;&lt; 4" />
+      <member cname="GTK_HTML_FONT_STYLE_UNDERLINE" name="Underline" value="1 &lt;&lt; 5" />
+      <member cname="GTK_HTML_FONT_STYLE_STRIKEOUT" name="Strikeout" value="1 &lt;&lt; 6" />
+      <member cname="GTK_HTML_FONT_STYLE_FIXED" name="Fixed" value="1 &lt;&lt; 7" />
+      <member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 &lt;&lt; 8" />
+      <member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 &lt;&lt; 9" />
     </enum>
     <enum name="HTMLFontStyleShift" cname="GtkHTMLFontStyleShift" type="enum">
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_BOLD" name="Bold" value="3"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_ITALIC" name="Italic" value="4"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE" name="Underline" value="5"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT" name="Strikeout" value="6"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_FIXED" name="Fixed" value="7"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT" name="Subscript" value="8"/>
-      <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT" name="Superscript" value="9"/>
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_BOLD" name="Bold" value="3" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_ITALIC" name="Italic" value="4" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE" name="Underline" value="5" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT" name="Strikeout" value="6" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_FIXED" name="Fixed" value="7" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT" name="Subscript" value="8" />
+      <member cname="GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT" name="Superscript" value="9" />
     </enum>
     <enum name="HTMLParagraphAlignment" cname="GtkHTMLParagraphAlignment" type="enum">
-      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_LEFT" name="Left"/>
-      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_RIGHT" name="Right"/>
-      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_CENTER" name="Center"/>
+      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_LEFT" name="Left" />
+      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_RIGHT" name="Right" />
+      <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_CENTER" name="Center" />
     </enum>
     <enum name="HTMLParagraphStyle" cname="GtkHTMLParagraphStyle" type="enum">
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_NORMAL" name="Normal"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H1" name="H1"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H2" name="H2"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H3" name="H3"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H4" name="H4"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H5" name="H5"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_H6" name="H6"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_ADDRESS" name="Address"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_PRE" name="Pre"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMDOTTED" name="Itemdotted"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMROMAN" name="Itemroman"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMDIGIT" name="Itemdigit"/>
-      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMALPHA" name="Itemalpha"/>
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_NORMAL" name="Normal" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H1" name="H1" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H2" name="H2" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H3" name="H3" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H4" name="H4" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H5" name="H5" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_H6" name="H6" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_ADDRESS" name="Address" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_PRE" name="Pre" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMDOTTED" name="Itemdotted" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMROMAN" name="Itemroman" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMDIGIT" name="Itemdigit" />
+      <member cname="GTK_HTML_PARAGRAPH_STYLE_ITEMALPHA" name="Itemalpha" />
     </enum>
     <enum name="HTMLStreamStatus" cname="GtkHTMLStreamStatus" type="enum">
-      <member cname="GTK_HTML_STREAM_OK" name="Ok"/>
-      <member cname="GTK_HTML_STREAM_ERROR" name="Error"/>
+      <member cname="GTK_HTML_STREAM_OK" name="Ok" />
+      <member cname="GTK_HTML_STREAM_ERROR" name="Error" />
     </enum>
     <callback name="HTMLPrintCallback" cname="GtkHTMLPrintCallback">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkHTML*" name="html"/>
-        <parameter type="GnomePrintContext*" name="print_context"/>
-        <parameter type="gdouble" name="x"/>
-        <parameter type="gdouble" name="y"/>
-        <parameter type="gdouble" name="width"/>
-        <parameter type="gdouble" name="height"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkHTML*" name="html" />
+        <parameter type="GnomePrintContext*" name="print_context" />
+        <parameter type="gdouble" name="x" />
+        <parameter type="gdouble" name="y" />
+        <parameter type="gdouble" name="width" />
+        <parameter type="gdouble" name="height" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="HTMLSaveReceiverFn" cname="GtkHTMLSaveReceiverFn">
-      <return-type type="gboolean"/>
+      <return-type type="gboolean" />
       <parameters>
-        <parameter type="gpointer" name="engine"/>
-        <parameter type="const-gchar*" name="data"/>
-        <parameter type="size_t" name="len"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="gpointer" name="engine" />
+        <parameter type="const-gchar*" name="data" />
+        <parameter type="size_t" name="len" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="HTMLStreamCloseFunc" cname="GtkHTMLStreamCloseFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkHTMLStream*" name="stream"/>
-        <parameter type="GtkHTMLStreamStatus" name="status"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkHTMLStream*" name="stream" />
+        <parameter type="GtkHTMLStreamStatus" name="status" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="HTMLStreamTypesFunc" cname="GtkHTMLStreamTypesFunc">
-      <return-type type="char**"/>
+      <return-type type="char**" />
       <parameters>
-        <parameter type="GtkHTMLStream*" name="stream"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkHTMLStream*" name="stream" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <callback name="HTMLStreamWriteFunc" cname="GtkHTMLStreamWriteFunc">
-      <return-type type="void"/>
+      <return-type type="void" />
       <parameters>
-        <parameter type="GtkHTMLStream*" name="stream"/>
-        <parameter type="const-gchar*" name="buffer"/>
-        <parameter type="size_t" name="size"/>
-        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GtkHTMLStream*" name="stream" />
+        <parameter type="const-gchar*" name="buffer" />
+        <parameter type="size_t" name="size" />
+        <parameter type="gpointer" name="user_data" />
       </parameters>
     </callback>
     <object name="HTML" cname="GtkHTML" parent="GtkLayout">
-      <field cname="iframe_parent" type="GtkWidget*"/>
-      <field cname="frame" type="HTMLObject*"/>
-      <field cname="editor_api" type="GtkHTMLEditorAPI*"/>
-      <field cname="editor_data" type="gpointer"/>
-      <field cname="engine" type="HTMLEngine*"/>
-      <field cname="pointer_url" type="gchar*"/>
-      <field cname="hand_cursor" type="GdkCursor*"/>
-      <field cname="ibeam_cursor" type="GdkCursor*"/>
-      <field cname="selection_x1" type="gint"/>
-      <field cname="selection_y1" type="gint"/>
-      <field cname="in_selection" bits="1" type="guint"/>
-      <field cname="in_selection_drag" bits="1" type="guint"/>
-      <field cname="debug" bits="1" type="guint"/>
-      <field cname="allow_selection" bits="1" type="guint"/>
-      <field cname="hadj_connection" type="guint"/>
-      <field cname="vadj_connection" type="guint"/>
-      <field cname="binding_handled" type="gboolean"/>
-      <field cname="priv" type="GtkHTMLPrivate*"/>
+      <field cname="iframe_parent" type="GtkWidget*" />
+      <field cname="frame" type="HTMLObject*" />
+      <field cname="editor_api" type="GtkHTMLEditorAPI*" />
+      <field cname="editor_data" type="gpointer" />
+      <field cname="engine" type="HTMLEngine*" />
+      <field cname="pointer_url" type="gchar*" />
+      <field cname="hand_cursor" type="GdkCursor*" />
+      <field cname="ibeam_cursor" type="GdkCursor*" />
+      <field cname="selection_x1" type="gint" />
+      <field cname="selection_y1" type="gint" />
+      <field cname="in_selection" bits="1" type="guint" />
+      <field cname="in_selection_drag" bits="1" type="guint" />
+      <field cname="debug" bits="1" type="guint" />
+      <field cname="allow_selection" bits="1" type="guint" />
+      <field cname="hadj_connection" type="guint" />
+      <field cname="vadj_connection" type="guint" />
+      <field cname="binding_handled" type="gboolean" />
+      <field cname="priv" type="GtkHTMLPrivate*" />
       <signal name="TitleChanged" cname="title_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="new_title"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="new_title" />
         </parameters>
       </signal>
       <signal name="UrlRequested" cname="url_requested" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="url"/>
-          <parameter type="GtkHTMLStream*" name="handle"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="url" />
+          <parameter type="GtkHTMLStream*" name="handle" />
         </parameters>
       </signal>
       <signal name="LoadDone" cname="load_done" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
+          <parameter type="GtkHTML*" name="html" />
         </parameters>
       </signal>
       <signal name="LinkClicked" cname="link_clicked" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </signal>
       <signal name="SetBase" cname="set_base" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="base_url"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="base_url" />
         </parameters>
       </signal>
       <signal name="SetBaseTarget" cname="set_base_target" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="base_url"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="base_url" />
         </parameters>
       </signal>
       <signal name="OnUrl" cname="on_url" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </signal>
       <signal name="Redirect" cname="redirect" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="url"/>
-          <parameter type="int" name="delay"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="url" />
+          <parameter type="int" name="delay" />
         </parameters>
       </signal>
       <signal name="Submit" cname="submit" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="const-gchar*" name="method"/>
-          <parameter type="const-gchar*" name="url"/>
-          <parameter type="const-gchar*" name="encoding"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="const-gchar*" name="method" />
+          <parameter type="const-gchar*" name="url" />
+          <parameter type="const-gchar*" name="encoding" />
         </parameters>
       </signal>
       <signal name="ObjectRequested" cname="object_requested" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="*" name=""/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="*" name="" />
         </parameters>
       </signal>
       <signal name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLParagraphStyle" name="new_style"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLParagraphStyle" name="new_style" />
         </parameters>
       </signal>
       <signal name="CurrentParagraphIndentationChanged" cname="current_paragraph_indentation_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="guint" name="new_indentation"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="guint" name="new_indentation" />
         </parameters>
       </signal>
       <signal name="CurrentParagraphAlignmentChanged" cname="current_paragraph_alignment_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLParagraphAlignment" name="new_alignment"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLParagraphAlignment" name="new_alignment" />
         </parameters>
       </signal>
       <signal name="InsertionFontStyleChanged" cname="insertion_font_style_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLFontStyle" name="style"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLFontStyle" name="style" />
         </parameters>
       </signal>
       <signal name="InsertionColorChanged" cname="insertion_color_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GdkColor*" name="color"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GdkColor*" name="color" />
         </parameters>
       </signal>
       <signal name="SizeChanged" cname="size_changed" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
+          <parameter type="GtkHTML*" name="html" />
         </parameters>
       </signal>
       <signal name="IframeCreated" cname="iframe_created" when="FIRST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTML*" name="iframe"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTML*" name="iframe" />
         </parameters>
       </signal>
       <signal name="Scroll" cname="scroll" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkOrientation" name="orientation"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkOrientation" name="orientation" />
+          <parameter type="GtkScrollType" name="scroll_type" />
+          <parameter type="gfloat" name="position" />
         </parameters>
       </signal>
       <signal name="CursorMove" cname="cursor_move" when="LAST">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkDirectionType" name="dir_type"/>
-          <parameter type="GtkHTMLCursorSkipType" name="skip"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkDirectionType" name="dir_type" />
+          <parameter type="GtkHTMLCursorSkipType" name="skip" />
         </parameters>
       </signal>
       <signal name="OnCommand" cname="command" when="LAST">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLCommandType" name="com_type"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLCommandType" name="com_type" />
         </parameters>
       </signal>
-      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true"/>
-      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true"/>
-      <property name="DocumentBase" cname="document_base" type="gchar*" readable="true" writeable="true"/>
-      <property name="TargetBase" cname="target_base" type="gchar*" readable="true" writeable="true"/>
+      <property name="Editable" cname="editable" type="gboolean" readable="true" writeable="true" />
+      <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
+      <property name="DocumentBase" cname="document_base" type="gchar*" readable="true" writeable="true" />
+      <property name="TargetBase" cname="target_base" type="gchar*" readable="true" writeable="true" />
       <method name="AllowSelection" cname="gtk_html_allow_selection">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="allow"/>
+          <parameter type="gboolean" name="allow" />
         </parameters>
       </method>
       <method name="AppendHtml" cname="gtk_html_append_html">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="html_src"/>
+          <parameter type="const-gchar*" name="html_src" />
         </parameters>
       </method>
       <method name="Begin" cname="gtk_html_begin">
-        <return-type type="GtkHTMLStream*"/>
+        <return-type type="GtkHTMLStream*" />
       </method>
       <method name="Begin" cname="gtk_html_begin_content">
-        <return-type type="GtkHTMLStream*"/>
+        <return-type type="GtkHTMLStream*" />
         <parameters>
-          <parameter type="gchar*" name="content_type"/>
+          <parameter type="gchar*" name="content_type" />
         </parameters>
       </method>
       <method name="Begin" cname="gtk_html_begin_full">
-        <return-type type="GtkHTMLStream*"/>
+        <return-type type="GtkHTMLStream*" />
         <parameters>
-          <parameter type="char*" name="target_frame"/>
-          <parameter type="char*" name="content_type"/>
-          <parameter type="GtkHTMLBeginFlags" name="flags"/>
+          <parameter type="char*" name="target_frame" />
+          <parameter type="char*" name="content_type" />
+          <parameter type="GtkHTMLBeginFlags" name="flags" />
         </parameters>
       </method>
       <method name="Command" cname="gtk_html_command">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="command_name"/>
+          <parameter type="const-gchar*" name="command_name" />
         </parameters>
       </method>
       <method name="Construct" cname="gtk_html_construct" shared="true">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkWidget*" name="html"/>
+          <parameter type="GtkWidget*" name="html" />
         </parameters>
       </method>
       <method name="Copy" cname="gtk_html_copy">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Cut" cname="gtk_html_cut">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="DropUndo" cname="gtk_html_drop_undo">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="EditMakeCursorVisible" cname="gtk_html_edit_make_cursor_visible">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="EnableDebug" cname="gtk_html_enable_debug">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="debug"/>
+          <parameter type="gboolean" name="debug" />
         </parameters>
       </method>
       <method name="End" cname="gtk_html_end">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLStream*" name="handle"/>
-          <parameter type="GtkHTMLStreamStatus" name="status"/>
+          <parameter type="GtkHTMLStream*" name="handle" />
+          <parameter type="GtkHTMLStreamStatus" name="status" />
         </parameters>
       </method>
       <method name="Export" cname="gtk_html_export">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="type"/>
-          <parameter type="GtkHTMLSaveReceiverFn" name="receiver"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="const-char*" name="type" />
+          <parameter type="GtkHTMLSaveReceiverFn" name="receiver" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="GetAllowFrameset" cname="gtk_html_get_allow_frameset">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetAnimate" cname="gtk_html_get_animate">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetBase" cname="gtk_html_get_base">
-        <return-type type="const-char*"/>
+        <return-type type="const-char*" />
       </method>
       <method name="GetEditable" cname="gtk_html_get_editable">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetInlineSpelling" cname="gtk_html_get_inline_spelling">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetMagicLinks" cname="gtk_html_get_magic_links">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetMagicSmileys" cname="gtk_html_get_magic_smileys">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="GetObjectById" cname="gtk_html_get_object_by_id">
-        <return-type type="gpointer"/>
+        <return-type type="gpointer" />
         <parameters>
-          <parameter type="const-gchar*" name="id"/>
+          <parameter type="const-gchar*" name="id" />
         </parameters>
       </method>
       <method name="GetParagraphAlignment" cname="gtk_html_get_paragraph_alignment">
-        <return-type type="GtkHTMLParagraphAlignment"/>
+        <return-type type="GtkHTMLParagraphAlignment" />
       </method>
       <method name="GetParagraphIndentation" cname="gtk_html_get_paragraph_indentation">
-        <return-type type="guint"/>
+        <return-type type="guint" />
       </method>
       <method name="GetParagraphStyle" cname="gtk_html_get_paragraph_style">
-        <return-type type="GtkHTMLParagraphStyle"/>
+        <return-type type="GtkHTMLParagraphStyle" />
       </method>
       <method name="GetTitle" cname="gtk_html_get_title">
-        <return-type type="const-gchar*"/>
+        <return-type type="const-gchar*" />
       </method>
       <method name="GetType" cname="gtk_html_get_type" shared="true">
-        <return-type type="GtkType"/>
+        <return-type type="GtkType" />
       </method>
       <method name="GetUrlBaseRelative" cname="gtk_html_get_url_base_relative">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="const-char*" name="url"/>
+          <parameter type="const-char*" name="url" />
         </parameters>
       </method>
       <method name="GetUrlObjectRelative" cname="gtk_html_get_url_object_relative">
-        <return-type type="char*"/>
+        <return-type type="char*" />
         <parameters>
-          <parameter type="HTMLObject*" name="o"/>
-          <parameter type="const-char*" name="url"/>
+          <parameter type="HTMLObject*" name="o" />
+          <parameter type="const-char*" name="url" />
         </parameters>
       </method>
       <method name="HasUndo" cname="gtk_html_has_undo">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
       </method>
       <method name="ImagePreload" cname="gtk_html_image_preload">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </method>
       <method name="ImageRef" cname="gtk_html_image_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </method>
       <method name="ImageUnref" cname="gtk_html_image_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="url"/>
+          <parameter type="const-gchar*" name="url" />
         </parameters>
       </method>
       <method name="ImagesRef" cname="gtk_html_images_ref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ImagesUnref" cname="gtk_html_images_unref">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="IndentPopLevel" cname="gtk_html_indent_pop_level">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="IndentPushLevel" cname="gtk_html_indent_push_level">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="HTMLListType" name="level_type"/>
+          <parameter type="HTMLListType" name="level_type" />
         </parameters>
       </method>
       <method name="InsertGtkHtml" cname="gtk_html_insert_gtk_html">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="to_be_destroyed"/>
+          <parameter type="GtkHTML*" name="to_be_destroyed" />
         </parameters>
       </method>
       <method name="InsertHtml" cname="gtk_html_insert_html">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="html_src"/>
+          <parameter type="const-gchar*" name="html_src" />
         </parameters>
       </method>
       <method name="JumpToAnchor" cname="gtk_html_jump_to_anchor">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-gchar*" name="anchor"/>
+          <parameter type="const-gchar*" name="anchor" />
         </parameters>
       </method>
       <method name="LoadEmpty" cname="gtk_html_load_empty">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="LoadFromString" cname="gtk_html_load_from_string">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="str" />
+          <parameter type="gint" name="len" />
         </parameters>
       </method>
-      <constructor cname="gtk_html_new"/>
+      <constructor cname="gtk_html_new" />
       <constructor cname="gtk_html_new_from_string">
         <parameters>
-          <parameter type="const-gchar*" name="Astr"/>
-          <parameter type="gint" name="len"/>
+          <parameter type="const-gchar*" name="Astr" />
+          <parameter type="gint" name="len" />
         </parameters>
       </constructor>
       <method name="Paste" cname="gtk_html_paste">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="as_cite"/>
+          <parameter type="gboolean" name="as_cite" />
         </parameters>
       </method>
       <method name="Print" cname="gtk_html_print">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="print_context"/>
+          <parameter type="GnomePrintContext*" name="print_context" />
         </parameters>
       </method>
       <method name="PrintGetPagesNum" cname="gtk_html_print_get_pages_num">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="print_context"/>
-          <parameter type="gdouble" name="header_height"/>
-          <parameter type="gdouble" name="footer_height"/>
+          <parameter type="GnomePrintContext*" name="print_context" />
+          <parameter type="gdouble" name="header_height" />
+          <parameter type="gdouble" name="footer_height" />
         </parameters>
       </method>
       <method name="PrintSetMaster" cname="gtk_html_print_set_master">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePrintJob*" name="print_master"/>
+          <parameter type="GnomePrintJob*" name="print_master" />
         </parameters>
       </method>
       <method name="PrintWithHeaderFooter" cname="gtk_html_print_with_header_footer">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GnomePrintContext*" name="print_context"/>
-          <parameter type="gdouble" name="header_height"/>
-          <parameter type="gdouble" name="footer_height"/>
-          <parameter type="GtkHTMLPrintCallback" name="header_print"/>
-          <parameter type="GtkHTMLPrintCallback" name="footer_print"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GnomePrintContext*" name="print_context" />
+          <parameter type="gdouble" name="header_height" />
+          <parameter type="gdouble" name="footer_height" />
+          <parameter type="GtkHTMLPrintCallback" name="header_print" />
+          <parameter type="GtkHTMLPrintCallback" name="footer_print" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
       <method name="Redo" cname="gtk_html_redo">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="RequestPaste" cname="gtk_html_request_paste">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="GdkAtom" name="selection"/>
-          <parameter type="gint" name="type"/>
-          <parameter type="gint32" name="time"/>
-          <parameter type="gboolean" name="as_cite"/>
+          <parameter type="GdkAtom" name="selection" />
+          <parameter type="gint" name="type" />
+          <parameter type="gint32" name="time" />
+          <parameter type="gboolean" name="as_cite" />
         </parameters>
       </method>
       <method name="Save" cname="gtk_html_save">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkHTMLSaveReceiverFn" name="receiver"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkHTMLSaveReceiverFn" name="receiver" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="SelectAll" cname="gtk_html_select_all">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectLine" cname="gtk_html_select_line">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectParagraph" cname="gtk_html_select_paragraph">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectParagraphExtended" cname="gtk_html_select_paragraph_extended">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SelectWord" cname="gtk_html_select_word">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="SetAllowFrameset" cname="gtk_html_set_allow_frameset">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="allow"/>
+          <parameter type="gboolean" name="allow" />
         </parameters>
       </method>
       <method name="SetAnimate" cname="gtk_html_set_animate">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="animate"/>
+          <parameter type="gboolean" name="animate" />
         </parameters>
       </method>
       <method name="SetBase" cname="gtk_html_set_base">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="url"/>
+          <parameter type="const-char*" name="url" />
         </parameters>
       </method>
       <method name="SetBlocking" cname="gtk_html_set_blocking">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="block"/>
+          <parameter type="gboolean" name="block" />
         </parameters>
       </method>
       <method name="SetColor" cname="gtk_html_set_color">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="HTMLColor*" name="color"/>
+          <parameter type="HTMLColor*" name="color" />
         </parameters>
       </method>
       <method name="SetDefaultContentType" cname="gtk_html_set_default_content_type">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gchar*" name="content_type"/>
+          <parameter type="gchar*" name="content_type" />
         </parameters>
       </method>
       <method name="SetEditable" cname="gtk_html_set_editable">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="editable"/>
+          <parameter type="gboolean" name="editable" />
         </parameters>
       </method>
       <method name="SetEditorApi" cname="gtk_html_set_editor_api">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLEditorAPI*" name="api"/>
-          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkHTMLEditorAPI*" name="api" />
+          <parameter type="gpointer" name="data" />
         </parameters>
       </method>
       <method name="SetFontStyle" cname="gtk_html_set_font_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLFontStyle" name="and_mask"/>
-          <parameter type="GtkHTMLFontStyle" name="or_mask"/>
+          <parameter type="GtkHTMLFontStyle" name="and_mask" />
+          <parameter type="GtkHTMLFontStyle" name="or_mask" />
         </parameters>
       </method>
       <method name="SetIframeParent" cname="gtk_html_set_iframe_parent">
-        <return-type type="gint"/>
+        <return-type type="gint" />
         <parameters>
-          <parameter type="GtkWidget*" name="parent"/>
-          <parameter type="HTMLObject*" name="frame"/>
+          <parameter type="GtkWidget*" name="parent" />
+          <parameter type="HTMLObject*" name="frame" />
         </parameters>
       </method>
       <method name="SetIndent" cname="gtk_html_set_indent">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GByteArray*" name="levels"/>
+          <parameter type="GByteArray*" name="levels" />
         </parameters>
       </method>
       <method name="SetInlineSpelling" cname="gtk_html_set_inline_spelling">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="inline_spell"/>
+          <parameter type="gboolean" name="inline_spell" />
         </parameters>
       </method>
       <method name="SetMagicLinks" cname="gtk_html_set_magic_links">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="magic_links"/>
+          <parameter type="gboolean" name="magic_links" />
         </parameters>
       </method>
       <method name="SetMagicSmileys" cname="gtk_html_set_magic_smileys">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gboolean" name="magic_smileys"/>
+          <parameter type="gboolean" name="magic_smileys" />
         </parameters>
       </method>
       <method name="SetMagnification" cname="gtk_html_set_magnification">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="gdouble" name="magnification"/>
+          <parameter type="gdouble" name="magnification" />
         </parameters>
       </method>
       <method name="SetParagraphAlignment" cname="gtk_html_set_paragraph_alignment">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLParagraphAlignment" name="alignment"/>
+          <parameter type="GtkHTMLParagraphAlignment" name="alignment" />
         </parameters>
       </method>
       <method name="SetParagraphStyle" cname="gtk_html_set_paragraph_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLParagraphStyle" name="style"/>
+          <parameter type="GtkHTMLParagraphStyle" name="style" />
         </parameters>
       </method>
       <method name="SetTitle" cname="gtk_html_set_title">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-char*" name="title"/>
+          <parameter type="const-char*" name="title" />
         </parameters>
       </method>
       <method name="ToggleFontStyle" cname="gtk_html_toggle_font_style">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLFontStyle" name="style"/>
+          <parameter type="GtkHTMLFontStyle" name="style" />
         </parameters>
       </method>
       <method name="Undo" cname="gtk_html_undo">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="UpdateStyles" cname="gtk_html_update_styles">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="Write" cname="gtk_html_write">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLStream*" name="handle"/>
-          <parameter type="const-gchar*" name="buffer"/>
-          <parameter type="size_t" name="size"/>
+          <parameter type="GtkHTMLStream*" name="handle" />
+          <parameter type="const-gchar*" name="buffer" />
+          <parameter type="size_t" name="size" />
         </parameters>
       </method>
       <method name="ZoomIn" cname="gtk_html_zoom_in">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ZoomOut" cname="gtk_html_zoom_out">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="ZoomReset" cname="gtk_html_zoom_reset">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
     </object>
-    <struct name="HTMLClassProperties" cname="GtkHTMLClassProperties" opaque="true"/>
+    <struct name="HTMLClassProperties" cname="GtkHTMLClassProperties" opaque="true" />
     <struct name="HTMLEditorAPI" cname="GtkHTMLEditorAPI">
       <callback cname="check_word">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="suggestion_request">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="add_to_session">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="add_to_personal">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="command">
-        <return-type type="gboolean"/>
+        <return-type type="gboolean" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="event">
-        <return-type type="GValue*"/>
+        <return-type type="GValue*" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="create_input_line">
-        <return-type type="GtkWidget*"/>
+        <return-type type="GtkWidget*" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
       <callback cname="set_language">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTML*" name="html,"/>
+          <parameter type="GtkHTML*" name="html," />
         </parameters>
       </callback>
     </struct>
-    <struct name="HTMLEmbedded" cname="GtkHTMLEmbedded" opaque="true"/>
-    <struct name="HTMLEmbeddedClass" cname="GtkHTMLEmbeddedClass" opaque="true"/>
+    <struct name="HTMLEmbedded" cname="GtkHTMLEmbedded" opaque="true" />
+    <struct name="HTMLEmbeddedClass" cname="GtkHTMLEmbeddedClass" opaque="true" />
     <struct name="HTMLStream" cname="GtkHTMLStream">
-      <field cname="write_func" type="GtkHTMLStreamWriteFunc"/>
-      <field cname="close_func" type="GtkHTMLStreamCloseFunc"/>
-      <field cname="types_func" type="GtkHTMLStreamTypesFunc"/>
-      <field cname="user_data" type="gpointer"/>
+      <field cname="write_func" type="GtkHTMLStreamWriteFunc" />
+      <field cname="close_func" type="GtkHTMLStreamCloseFunc" />
+      <field cname="types_func" type="GtkHTMLStreamTypesFunc" />
+      <field cname="user_data" type="gpointer" />
       <method name="Close" cname="gtk_html_stream_close">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="GtkHTMLStreamStatus" name="status"/>
+          <parameter type="GtkHTMLStreamStatus" name="status" />
         </parameters>
       </method>
       <method name="Destroy" cname="gtk_html_stream_destroy">
-        <return-type type="void"/>
+        <return-type type="void" />
       </method>
       <method name="GetTypes" cname="gtk_html_stream_get_types">
-        <return-type type="char**"/>
+        <return-type type="char**" />
       </method>
       <method name="LogNew" cname="gtk_html_stream_log_new" shared="true">
-        <return-type type="GtkHTMLStream*"/>
+        <return-type type="GtkHTMLStream*" />
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLStream*" name="stream"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLStream*" name="stream" />
         </parameters>
       </method>
       <constructor cname="gtk_html_stream_new">
         <parameters>
-          <parameter type="GtkHTML*" name="html"/>
-          <parameter type="GtkHTMLStreamTypesFunc" name="type_func"/>
-          <parameter type="GtkHTMLStreamWriteFunc" name="write_func"/>
-          <parameter type="GtkHTMLStreamCloseFunc" name="close_func"/>
-          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GtkHTML*" name="html" />
+          <parameter type="GtkHTMLStreamTypesFunc" name="type_func" />
+          <parameter type="GtkHTMLStreamWriteFunc" name="write_func" />
+          <parameter type="GtkHTMLStreamCloseFunc" name="close_func" />
+          <parameter type="gpointer" name="user_data" />
         </parameters>
       </constructor>
       <method name="Printf" cname="gtk_html_stream_printf">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="format"/>
-          <parameter ellipsis="true"/>
+          <parameter type="const-char*" name="format" />
+          <parameter ellipsis="true" />
         </parameters>
       </method>
       <method name="Vprintf" cname="gtk_html_stream_vprintf">
-        <return-type type="int"/>
+        <return-type type="int" />
         <parameters>
-          <parameter type="const-char*" name="format"/>
-          <parameter type="va_list" name="ap"/>
+          <parameter type="const-char*" name="format" />
+          <parameter type="va_list" name="ap" />
         </parameters>
       </method>
       <method name="Write" cname="gtk_html_stream_write">
-        <return-type type="void"/>
+        <return-type type="void" />
         <parameters>
-          <parameter type="const-guchar*" name="buffer" array="1"/>
-          <parameter type="size_t" name="size"/>
+          <parameter name="buffer" type="const-guchar*" array="1" />
+          <parameter type="size_t" name="size" />
         </parameters>
       </method>
     </struct>
   </namespace>
-</api>
+</api>
\ No newline at end of file
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 77093ff4a..041d10375 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -1,342 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
 
-<!-- out parameters -->
-<rule>
-  <class name="GtkEditable">
-    <method>InsertText</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">position</filter>
-      <name>pass_as</name>
-      <value>ref</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>GetIterAtLineOffset</method>
-    <method>GetIterAtLineIndex</method>
-    <method>GetIterAtOffset</method>
-    <method>GetIterAtLine</method>
-    <method>GetStartIter</method>
-    <method>GetEndIter</method>
-    <method>GetBounds</method>
-    <method>GetIterAtMark</method>
-    <method>GetIterAtChildAnchor</method>
-    <method>GetSelectionBounds</method>
-  </class>
-  <class name="GtkTextLayout">
-    <method>GetIterAtLine</method>
-  </class>
-  <class name="GtkTextView">
-    <method>GetIterAtLocation</method>
-    <method>GetLineAtY</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextIter*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkListStore">
-    <method>Append</method>
-    <method>Insert</method>
-    <method>InsertAfter</method>
-    <method>InsertBefore</method>
-    <method>Prepend</method>
-    <method>Remove</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">iter</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkListStore">
-    <method>SetColumnTypes</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">types</filter>
-      <name>array</name>
-      <value>true</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeStore">
-    <method>SetColumnTypes</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">types</filter>
-      <name>array</name>
-      <value>true</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModelSort">
-    <method>ConvertChildIterToIter</method>
-   </class>
-   <data>
-     <attribute target="param">
-       <filter level="name">sort_iter</filter>
-       <name>pass_as</name>
-       <value>out</value>
-     </attribute>
-   </data>
-</rule>
-<rule>
-  <class name="GtkTreeModel">
-    <method>GetIter</method>
-    <method>GetIterFirst</method>
-    <method>GetIterFromString</method>
-    <method>IterChildren</method>
-    <method>IterNext</method>
-    <method>IterNthChild</method>
-    <method>IterParent</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">iter</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeModelSort">
-    <method>ConvertIterToChildIter</method>
-   </class>
-   <data>
-     <attribute target="param">
-       <filter level="name">child_iter</filter>
-       <name>pass_as</name>
-       <value>out</value>
-     </attribute>
-   </data>
-</rule>
-<rule>
-  <class name="GtkTreeStore">
-    <method>Append</method>
-    <method>Insert</method>
-    <method>InsertAfter</method>
-    <method>InsertBefore</method>
-    <method>Prepend</method>
-    <method>Remove</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">iter</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkScrolledWindow">
-    <method>GetPolicy</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkPolicyType*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>Path</method>
-    <method>ClassPath</method>
-  </class>
-  <data>
-    <attribute target="param">
-	  <filter name="type">gchar**</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-	</attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>Intersect</method>
-  </class>
-  <data>
-    <attribute target="param">
-	  <filter level="name">intersection</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-	</attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>SizeRequest</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">requisition</filter>
-      <name>pass_as</name>
-      <value>ref</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>GetCursor</method>
-  </class>
-  <data>
-    <attribute target="param">
-	  <filter level="name">focus_column</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-    </attribute>
-    <attribute target="param">
-	  <filter level="name">path</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>GetDragDestRow</method>
-    <method>GetDestRowAtPos</method>
-  </class>
-  <data>
-    <attribute target="param">
-	  <filter level="name">pos</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-    </attribute>
-    <attribute target="param">
-	  <filter level="name">path</filter>
-	  <name>pass_as</name>
-	  <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>GetCellArea</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">rect</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- variable arguments -->
-<rule>
-  <class name="GtkTreeStore">
-    <constructor>gtk_tree_store_newv</constructor>
-  </class>
-  <data>
-    <attribute target="parameters">
-      <name>va_type</name>
-      <value>length_param</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkListStore">
-    <constructor>gtk_list_store_newv</constructor>
-  </class>
-  <data>
-    <attribute target="parameters">
-      <name>va_type</name>
-      <value>length_param</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- misc -->
-<rule>
-  <class name="GtkHTMLStream">
-    <method>Write</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">buffer</filter>
-      <name>type</name>
-      <value>const-guchar*</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkHTMLStream">
-    <method>Write</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="name">buffer</filter>
-      <name>array</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-
-<!-- constructor collision hints -->
-<rule>
-  <class name="GtkButton">
-    <constructor>gtk_button_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkCheckButton">
-    <constructor>gtk_check_button_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkRadioButton">
-    <constructor>gtk_radio_button_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkToggleButton">
-    <constructor>gtk_toggle_button_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkLabel">
-    <constructor>gtk_label_new</constructor>
-  </class>
-  <class name="GtkMenuItem">
-    <constructor>gtk_menu_item_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkCheckMenuItem">
-    <constructor>gtk_check_menu_item_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkRadioMenuItem">
-    <constructor>gtk_radio_menu_item_new_with_mnemonic</constructor>
-  </class>
-  <class name="GtkImageMenuItem">
-    <constructor>gtk_image_menu_item_new_with_mnemonic</constructor>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>preferred</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkProgressBar"/>
-  <data>
-    <attribute target="class">
-      <name>parent</name>
-      <value>GtkWidget</value>
-    </attribute>
-  </data>
-</rule>
-
-
 <!-- renames -->
 <rule>
   <class name="GtkAccelerator_">