From a3f799ceb0ca4e97e621db635d184eae25de9c05 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Wed, 30 Apr 2008 19:42:11 +0000
Subject: [PATCH] 2008-04-30  Mike Kestner  <mkestner@novell.com>

	* parser/gapi2xml.pl: put class struct field in the signal elems.
	* atk/atk-api-2.12.raw:
	* gdk/gdk-api-2.12.raw:
	* gtk/gtk-api-2.12.raw:

svn path=/trunk/gtk-sharp/; revision=102238
---
 ChangeLog            |   7 +
 atk/atk-api-2.12.raw |  42 +--
 gdk/gdk-api-2.12.raw |  20 +-
 gtk/gtk-api-2.12.raw | 616 +++++++++++++++++++++----------------------
 parser/gapi2xml.pl   |   1 +
 5 files changed, 347 insertions(+), 339 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0419cd98f..42c5a0089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-30  Mike Kestner  <mkestner@novell.com>
+
+	* parser/gapi2xml.pl: put class struct field in the signal elems.
+	* atk/atk-api-2.12.raw:
+	* gdk/gdk-api-2.12.raw:
+	* gtk/gtk-api-2.12.raw:
+
 2008-04-28  Mike Kestner  <mkestner@novell.com>
 
 	* glib/Value.cs : Add GParam support and beef up the Boxed
diff --git a/atk/atk-api-2.12.raw b/atk/atk-api-2.12.raw
index cebbb55dc..43d44a437 100644
--- a/atk/atk-api-2.12.raw
+++ b/atk/atk-api-2.12.raw
@@ -358,7 +358,7 @@
       </method>
     </interface>
     <interface name="Component" cname="AtkComponent">
-      <signal name="BoundsChanged" cname="bounds_changed" when="LAST">
+      <signal name="BoundsChanged" cname="bounds_changed" when="LAST" field_name="bounds_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkComponent*" name="component" />
@@ -783,7 +783,7 @@
       </method>
     </interface>
     <interface name="Hypertext" cname="AtkHypertext">
-      <signal name="LinkSelected" cname="link_selected" when="LAST">
+      <signal name="LinkSelected" cname="link_selected" when="LAST" field_name="link_selected">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkHypertext*" name="hypertext" />
@@ -912,7 +912,7 @@
       </method>
     </interface>
     <interface name="Selection" cname="AtkSelection">
-      <signal name="SelectionChanged" cname="selection_changed" when="LAST">
+      <signal name="SelectionChanged" cname="selection_changed" when="LAST" field_name="selection_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkSelection*" name="selection" />
@@ -1055,7 +1055,7 @@
       </method>
     </interface>
     <interface name="Table" cname="AtkTable">
-      <signal name="RowInserted" cname="row_inserted" when="LAST">
+      <signal name="RowInserted" cname="row_inserted" when="LAST" field_name="row_inserted">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
@@ -1063,7 +1063,7 @@
           <parameter type="gint" name="num_inserted" />
         </parameters>
       </signal>
-      <signal name="ColumnInserted" cname="column_inserted" when="LAST">
+      <signal name="ColumnInserted" cname="column_inserted" when="LAST" field_name="column_inserted">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
@@ -1071,7 +1071,7 @@
           <parameter type="gint" name="num_inserted" />
         </parameters>
       </signal>
-      <signal name="RowDeleted" cname="row_deleted" when="LAST">
+      <signal name="RowDeleted" cname="row_deleted" when="LAST" field_name="row_deleted">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
@@ -1079,7 +1079,7 @@
           <parameter type="gint" name="num_deleted" />
         </parameters>
       </signal>
-      <signal name="ColumnDeleted" cname="column_deleted" when="LAST">
+      <signal name="ColumnDeleted" cname="column_deleted" when="LAST" field_name="column_deleted">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
@@ -1087,19 +1087,19 @@
           <parameter type="gint" name="num_deleted" />
         </parameters>
       </signal>
-      <signal name="RowReordered" cname="row_reordered" when="LAST">
+      <signal name="RowReordered" cname="row_reordered" when="LAST" field_name="row_reordered">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
         </parameters>
       </signal>
-      <signal name="ColumnReordered" cname="column_reordered" when="LAST">
+      <signal name="ColumnReordered" cname="column_reordered" when="LAST" field_name="column_reordered">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
         </parameters>
       </signal>
-      <signal name="ModelChanged" cname="model_changed" when="LAST">
+      <signal name="ModelChanged" cname="model_changed" when="LAST" field_name="model_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkTable*" name="table" />
@@ -1489,7 +1489,7 @@
       </method>
     </interface>
     <interface name="Text" cname="AtkText">
-      <signal name="TextChanged" cname="text_changed" when="LAST">
+      <signal name="TextChanged" cname="text_changed" when="LAST" field_name="text_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkText*" name="text" />
@@ -1497,20 +1497,20 @@
           <parameter type="gint" name="length" />
         </parameters>
       </signal>
-      <signal name="TextCaretMoved" cname="text_caret_moved" when="LAST">
+      <signal name="TextCaretMoved" cname="text_caret_moved" when="LAST" field_name="text_caret_moved">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkText*" name="text" />
           <parameter type="gint" name="location" />
         </parameters>
       </signal>
-      <signal name="TextSelectionChanged" cname="text_selection_changed" when="LAST">
+      <signal name="TextSelectionChanged" cname="text_selection_changed" when="LAST" field_name="text_selection_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkText*" name="text" />
         </parameters>
       </signal>
-      <signal name="TextAttributesChanged" cname="text_attributes_changed" when="LAST">
+      <signal name="TextAttributesChanged" cname="text_attributes_changed" when="LAST" field_name="text_attributes_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkText*" name="text" />
@@ -1931,7 +1931,7 @@
       <property name="NumberOfAnchors" cname="number-of-anchors" type="gint" readable="true" />
       <property name="EndIndex" cname="end-index" type="gint" readable="true" />
       <property name="StartIndex" cname="start-index" type="gint" readable="true" />
-      <signal name="LinkActivated" cname="link_activated" when="LAST">
+      <signal name="LinkActivated" cname="link_activated" when="LAST" field_name="link_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkHyperlink*" name="link_" />
@@ -2100,7 +2100,7 @@
       <property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" readable="true" writeable="true" />
       <property name="AtkObjectNamePropertyTableCaptionObject" cname="atk_object_name_property_table_caption_object" type="AtkObject" readable="true" writeable="true" />
       <property name="AtkObjectNamePropertyHypertextNumLinks" cname="atk_object_name_property_hypertext_num_links" type="gint" readable="true" />
-      <signal name="ChildrenChanged" cname="children_changed" when="LAST">
+      <signal name="ChildrenChanged" cname="children_changed" when="LAST" field_name="children_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
@@ -2108,21 +2108,21 @@
           <parameter type="gpointer" name="changed_child" />
         </parameters>
       </signal>
-      <signal name="FocusEvent" cname="focus_event" when="LAST">
+      <signal name="FocusEvent" cname="focus_event" when="LAST" field_name="focus_event">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
           <parameter type="gboolean" name="focus_in" />
         </parameters>
       </signal>
-      <signal name="PropertyChange" cname="property_change" when="LAST">
+      <signal name="PropertyChange" cname="property_change" when="LAST" field_name="property_change">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
           <parameter type="AtkPropertyValues*" name="values" />
         </parameters>
       </signal>
-      <signal name="StateChange" cname="state_change" when="LAST">
+      <signal name="StateChange" cname="state_change" when="LAST" field_name="state_change">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
@@ -2130,13 +2130,13 @@
           <parameter type="gboolean" name="state_set" />
         </parameters>
       </signal>
-      <signal name="VisibleDataChanged" cname="visible_data_changed" when="LAST">
+      <signal name="VisibleDataChanged" cname="visible_data_changed" when="LAST" field_name="visible_data_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
         </parameters>
       </signal>
-      <signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST">
+      <signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST" field_name="active_descendant_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="AtkObject*" name="accessible" />
diff --git a/gdk/gdk-api-2.12.raw b/gdk/gdk-api-2.12.raw
index a67dfc938..64e0f30cd 100644
--- a/gdk/gdk-api-2.12.raw
+++ b/gdk/gdk-api-2.12.raw
@@ -674,7 +674,7 @@
       <field name="DoubleClickDistance" cname="double_click_distance" type="guint" />
       <field name="ButtonX" cname="button_x" array_len="2" type="gint" />
       <field name="ButtonY" cname="button_y" array_len="2" type="gint" />
-      <signal name="Closed" cname="closed" when="LAST">
+      <signal name="Closed" cname="closed" when="LAST" field_name="closed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkDisplay*" name="display" />
@@ -882,7 +882,7 @@
       </method>
     </object>
     <object name="DisplayManager" cname="GdkDisplayManager" parent="GObject">
-      <signal name="DisplayOpened" cname="display_opened" when="LAST">
+      <signal name="DisplayOpened" cname="display_opened" when="LAST" field_name="display_opened">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkDisplayManager*" name="display_manager" />
@@ -1848,13 +1848,13 @@
     </object>
     <object name="Keymap" cname="GdkKeymap" parent="GObject">
       <field name="Display" cname="display" type="GdkDisplay*" />
-      <signal name="DirectionChanged" cname="direction_changed" when="LAST">
+      <signal name="DirectionChanged" cname="direction_changed" when="LAST" field_name="direction_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkKeymap*" name="keymap" />
         </parameters>
       </signal>
-      <signal name="KeysChanged" cname="keys_changed" when="LAST">
+      <signal name="KeysChanged" cname="keys_changed" when="LAST" field_name="keys_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkKeymap*" name="keymap" />
@@ -2065,13 +2065,13 @@
       <field name="Resolution" cname="resolution" type="double" />
       <property name="FontOptions" cname="font-options" type="gpointer" readable="true" writeable="true" />
       <property name="Resolution" cname="resolution" type="gdouble" readable="true" writeable="true" />
-      <signal name="SizeChanged" cname="size_changed" when="LAST">
+      <signal name="SizeChanged" cname="size_changed" when="LAST" field_name="size_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkScreen*" name="screen" />
         </parameters>
       </signal>
-      <signal name="CompositedChanged" cname="composited_changed" when="LAST">
+      <signal name="CompositedChanged" cname="composited_changed" when="LAST" field_name="composited_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkScreen*" name="screen" />
@@ -5379,7 +5379,7 @@
     </object>
     <object name="PixbufLoader" cname="GdkPixbufLoader" parent="GObject">
       <field name="Priv" cname="priv" type="gpointer" />
-      <signal name="SizePrepared" cname="size_prepared" when="LAST">
+      <signal name="SizePrepared" cname="size_prepared" when="LAST" field_name="size_prepared">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkPixbufLoader*" name="loader" />
@@ -5387,13 +5387,13 @@
           <parameter type="int" name="height" />
         </parameters>
       </signal>
-      <signal name="AreaPrepared" cname="area_prepared" when="LAST">
+      <signal name="AreaPrepared" cname="area_prepared" when="LAST" field_name="area_prepared">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkPixbufLoader*" name="loader" />
         </parameters>
       </signal>
-      <signal name="AreaUpdated" cname="area_updated" when="LAST">
+      <signal name="AreaUpdated" cname="area_updated" when="LAST" field_name="area_updated">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkPixbufLoader*" name="loader" />
@@ -5403,7 +5403,7 @@
           <parameter type="int" name="height" />
         </parameters>
       </signal>
-      <signal name="Closed" cname="closed" when="LAST">
+      <signal name="Closed" cname="closed" when="LAST" field_name="closed">
         <return-type type="void" />
         <parameters>
           <parameter type="GdkPixbufLoader*" name="loader" />
diff --git a/gtk/gtk-api-2.12.raw b/gtk/gtk-api-2.12.raw
index ad7e26849..c044a1c5c 100644
--- a/gtk/gtk-api-2.12.raw
+++ b/gtk/gtk-api-2.12.raw
@@ -1489,13 +1489,13 @@
       </method>
     </interface>
     <interface name="CellEditable" cname="GtkCellEditable">
-      <signal name="EditingDone" cname="editing_done" when="LAST">
+      <signal name="EditingDone" cname="editing_done" when="LAST" field_name="editing_done">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellEditable*" name="cell_editable" />
         </parameters>
       </signal>
-      <signal name="RemoveWidget" cname="remove_widget" when="LAST">
+      <signal name="RemoveWidget" cname="remove_widget" when="LAST" field_name="remove_widget">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellEditable*" name="cell_editable" />
@@ -1649,7 +1649,7 @@
       </method>
     </interface>
     <interface name="Editable" cname="GtkEditable">
-      <signal name="InsertText" cname="insert_text" when="LAST">
+      <signal name="InsertText" cname="insert_text" when="LAST" field_name="insert_text">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEditable*" name="editable" />
@@ -1658,7 +1658,7 @@
           <parameter type="gint*" name="position" />
         </parameters>
       </signal>
-      <signal name="DeleteText" cname="delete_text" when="LAST">
+      <signal name="DeleteText" cname="delete_text" when="LAST" field_name="delete_text">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEditable*" name="editable" />
@@ -1666,7 +1666,7 @@
           <parameter type="gint" name="end_pos" />
         </parameters>
       </signal>
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEditable*" name="editable" />
@@ -1797,31 +1797,31 @@
       </method>
     </interface>
     <interface name="FileChooser" cname="GtkFileChooser">
-      <signal name="CurrentFolderChanged" cname="current-folder-changed" when="LAST">
+      <signal name="CurrentFolderChanged" cname="current-folder-changed" when="LAST" field_name="current_folder_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFileChooser*" name="chooser" />
         </parameters>
       </signal>
-      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFileChooser*" name="chooser" />
         </parameters>
       </signal>
-      <signal name="UpdatePreview" cname="update-preview" when="LAST">
+      <signal name="UpdatePreview" cname="update-preview" when="LAST" field_name="update_preview">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFileChooser*" name="chooser" />
         </parameters>
       </signal>
-      <signal name="FileActivated" cname="file-activated" when="LAST">
+      <signal name="FileActivated" cname="file-activated" when="LAST" field_name="file_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFileChooser*" name="chooser" />
         </parameters>
       </signal>
-      <signal name="ConfirmOverwrite" cname="confirm-overwrite" when="LAST">
+      <signal name="ConfirmOverwrite" cname="confirm-overwrite" when="LAST" field_name="confirm_overwrite">
         <return-type type="GtkFileChooserConfirmation" />
         <parameters>
           <parameter type="GtkFileChooser*" name="chooser" />
@@ -2177,14 +2177,14 @@
       </method>
     </interface>
     <interface name="PrintOperationPreview" cname="GtkPrintOperationPreview">
-      <signal name="Ready" cname="ready" when="LAST">
+      <signal name="Ready" cname="ready" when="LAST" field_name="ready">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperationPreview*" name="preview" />
           <parameter type="GtkPrintContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="GotPageSize" cname="got-page-size" when="LAST">
+      <signal name="GotPageSize" cname="got-page-size" when="LAST" field_name="got_page_size">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperationPreview*" name="preview" />
@@ -2232,13 +2232,13 @@
       </method>
     </interface>
     <interface name="RecentChooser" cname="GtkRecentChooser">
-      <signal name="SelectionChanged" cname="selection-changed" when="LAST">
+      <signal name="SelectionChanged" cname="selection-changed" when="LAST" field_name="selection_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRecentChooser*" name="chooser" />
         </parameters>
       </signal>
-      <signal name="ItemActivated" cname="item-activated" when="LAST">
+      <signal name="ItemActivated" cname="item-activated" when="LAST" field_name="item_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRecentChooser*" name="chooser" />
@@ -2579,7 +2579,7 @@
       </method>
     </interface>
     <interface name="TreeModel" cname="GtkTreeModel">
-      <signal name="RowChanged" cname="row_changed" when="LAST">
+      <signal name="RowChanged" cname="row_changed" when="LAST" field_name="row_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeModel*" name="tree_model" />
@@ -2587,7 +2587,7 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
-      <signal name="RowInserted" cname="row_inserted" when="FIRST">
+      <signal name="RowInserted" cname="row_inserted" when="FIRST" field_name="row_inserted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeModel*" name="tree_model" />
@@ -2595,7 +2595,7 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
-      <signal name="RowHasChildToggled" cname="row_has_child_toggled" when="LAST">
+      <signal name="RowHasChildToggled" cname="row_has_child_toggled" when="LAST" field_name="row_has_child_toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeModel*" name="tree_model" />
@@ -2603,14 +2603,14 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
-      <signal name="RowDeleted" cname="row_deleted" when="FIRST">
+      <signal name="RowDeleted" cname="row_deleted" when="FIRST" field_name="row_deleted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeModel*" name="tree_model" />
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="RowsReordered" cname="rows_reordered" when="FIRST">
+      <signal name="RowsReordered" cname="rows_reordered" when="FIRST" field_name="rows_reordered">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeModel*" name="tree_model" />
@@ -2887,7 +2887,7 @@
       </method>
     </interface>
     <interface name="TreeSortable" cname="GtkTreeSortable">
-      <signal name="SortColumnChanged" cname="sort_column_changed" when="LAST">
+      <signal name="SortColumnChanged" cname="sort_column_changed" when="LAST" field_name="sort_column_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeSortable*" name="sortable" />
@@ -3162,7 +3162,7 @@
           <parameter name="p2" type="GdkModifierType" />
         </parameters>
       </signal>
-      <signal name="AccelChanged" cname="accel_changed" when="FIRST">
+      <signal name="AccelChanged" cname="accel_changed" when="FIRST" field_name="accel_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAccelGroup*" name="accel_group" />
@@ -3415,7 +3415,7 @@
       <property name="Sensitive" cname="sensitive" type="gboolean" readable="true" writeable="true" />
       <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
       <property name="ActionGroup" cname="action-group" type="GtkActionGroup" readable="true" writeable="true" />
-      <signal name="Activate" cname="activate" when="FIRST">
+      <signal name="Activate" cname="activate" when="FIRST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAction*" name="action" />
@@ -3755,13 +3755,13 @@
       <property name="StepIncrement" cname="step-increment" type="gdouble" readable="true" writeable="true" />
       <property name="PageIncrement" cname="page-increment" type="gdouble" readable="true" writeable="true" />
       <property name="PageSize" cname="page-size" type="gdouble" readable="true" writeable="true" />
-      <signal name="Changed" cname="changed" when="FIRST">
+      <signal name="Changed" cname="changed" when="FIRST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAdjustment*" name="adjustment" />
         </parameters>
       </signal>
-      <signal name="ValueChanged" cname="value_changed" when="FIRST">
+      <signal name="ValueChanged" cname="value_changed" when="FIRST" field_name="value_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAdjustment*" name="adjustment" />
@@ -3917,26 +3917,26 @@
       <field name="Close" cname="close" type="GtkWidget*" />
       <field name="Last" cname="last" type="GtkWidget*" />
       <field name="Priv" cname="priv" type="GtkAssistantPrivate*" />
-      <signal name="Cancel" cname="cancel" when="LAST">
+      <signal name="Cancel" cname="cancel" when="LAST" field_name="cancel">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAssistant*" name="assistant" />
         </parameters>
       </signal>
-      <signal name="Prepare" cname="prepare" when="LAST">
+      <signal name="Prepare" cname="prepare" when="LAST" field_name="prepare">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAssistant*" name="assistant" />
           <parameter type="GtkWidget*" name="page" />
         </parameters>
       </signal>
-      <signal name="Apply" cname="apply" when="LAST">
+      <signal name="Apply" cname="apply" when="LAST" field_name="apply">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAssistant*" name="assistant" />
         </parameters>
       </signal>
-      <signal name="Close" cname="close" when="LAST">
+      <signal name="Close" cname="close" when="LAST" field_name="close">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkAssistant*" name="assistant" />
@@ -4286,37 +4286,37 @@
       <property name="Yalign" cname="yalign" type="gfloat" readable="true" writeable="true" />
       <property name="Image" cname="image" type="GtkWidget" readable="true" writeable="true" />
       <property name="ImagePosition" cname="image-position" type="GtkPositionType" readable="true" writeable="true" />
-      <signal name="Pressed" cname="pressed" when="FIRST">
+      <signal name="Pressed" cname="pressed" when="FIRST" field_name="pressed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Released" cname="released" when="FIRST">
+      <signal name="Released" cname="released" when="FIRST" field_name="released">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Clicked" cname="clicked" when="FIRST">
+      <signal name="Clicked" cname="clicked" when="FIRST" field_name="clicked">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Enter" cname="enter" when="FIRST">
+      <signal name="Enter" cname="enter" when="FIRST" field_name="enter">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Leave" cname="leave" when="FIRST">
+      <signal name="Leave" cname="leave" when="FIRST" field_name="leave">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Activate" cname="activate" when="FIRST">
+      <signal name="Activate" cname="activate" when="FIRST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
@@ -4550,43 +4550,43 @@
       <property name="ShowDayNames" cname="show-day-names" type="gboolean" readable="true" writeable="true" />
       <property name="NoMonthChange" cname="no-month-change" type="gboolean" readable="true" writeable="true" />
       <property name="ShowWeekNumbers" cname="show-week-numbers" type="gboolean" readable="true" writeable="true" />
-      <signal name="MonthChanged" cname="month_changed" when="FIRST">
+      <signal name="MonthChanged" cname="month_changed" when="FIRST" field_name="month_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="DaySelected" cname="day_selected" when="FIRST">
+      <signal name="DaySelected" cname="day_selected" when="FIRST" field_name="day_selected">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="DaySelectedDoubleClick" cname="day_selected_double_click" when="FIRST">
+      <signal name="DaySelectedDoubleClick" cname="day_selected_double_click" when="FIRST" field_name="day_selected_double_click">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="PrevMonth" cname="prev_month" when="FIRST">
+      <signal name="PrevMonth" cname="prev_month" when="FIRST" field_name="prev_month">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="NextMonth" cname="next_month" when="FIRST">
+      <signal name="NextMonth" cname="next_month" when="FIRST" field_name="next_month">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="PrevYear" cname="prev_year" when="FIRST">
+      <signal name="PrevYear" cname="prev_year" when="FIRST" field_name="prev_year">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
         </parameters>
       </signal>
-      <signal name="NextYear" cname="next_year" when="FIRST">
+      <signal name="NextYear" cname="next_year" when="FIRST" field_name="next_year">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCalendar*" name="calendar" />
@@ -4668,13 +4668,13 @@
       <field name="CellBackgroundSet" cname="cell_background_set" bits="1" type="guint" />
       <field name="Sensitive" cname="sensitive" bits="1" type="guint" />
       <field name="Editing" cname="editing" bits="1" type="guint" />
-      <signal name="EditingCanceled" cname="editing-canceled" when="FIRST">
+      <signal name="EditingCanceled" cname="editing-canceled" when="FIRST" field_name="editing_canceled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRenderer*" name="cell" />
         </parameters>
       </signal>
-      <signal name="EditingStarted" cname="editing-started" when="FIRST">
+      <signal name="EditingStarted" cname="editing-started" when="FIRST" field_name="editing_started">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRenderer*" name="cell" />
@@ -4826,7 +4826,7 @@
       <property name="AccelMods" cname="accel-mods" type="GdkModifierType" readable="true" writeable="true" />
       <property name="Keycode" cname="keycode" type="guint" readable="true" writeable="true" />
       <property name="AccelMode" cname="accel-mode" type="GtkCellRendererAccelMode" readable="true" writeable="true" />
-      <signal name="AccelEdited" cname="accel-edited" when="LAST">
+      <signal name="AccelEdited" cname="accel-edited" when="LAST" field_name="accel_edited">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRendererAccel*" name="accel" />
@@ -4836,7 +4836,7 @@
           <parameter type="guint" name="hardware_keycode" />
         </parameters>
       </signal>
-      <signal name="AccelCleared" cname="accel-cleared" when="LAST">
+      <signal name="AccelCleared" cname="accel-cleared" when="LAST" field_name="accel_cleared">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRendererAccel*" name="accel" />
@@ -4948,7 +4948,7 @@
       <property name="WrapMode" cname="wrap-mode" type="PangoWrapMode" readable="true" writeable="true" />
       <property name="WrapWidth" cname="wrap-width" type="gint" readable="true" writeable="true" />
       <property name="Alignment" cname="alignment" type="PangoAlignment" readable="true" writeable="true" />
-      <signal name="Edited" cname="edited" when="LAST">
+      <signal name="Edited" cname="edited" when="LAST" field_name="edited">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRendererText*" name="cell_renderer_text" />
@@ -4976,7 +4976,7 @@
       <property name="Activatable" cname="activatable" type="gboolean" readable="true" writeable="true" />
       <property name="Radio" cname="radio" type="gboolean" readable="true" writeable="true" />
       <property name="IndicatorSize" cname="indicator-size" type="gint" readable="true" writeable="true" />
-      <signal name="Toggled" cname="toggled" when="LAST">
+      <signal name="Toggled" cname="toggled" when="LAST" field_name="toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCellRendererToggle*" name="cell_renderer_toggle" />
@@ -5097,7 +5097,7 @@
       <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
       <property name="Inconsistent" cname="inconsistent" type="gboolean" readable="true" writeable="true" />
       <property name="DrawAsRadio" cname="draw-as-radio" type="gboolean" readable="true" writeable="true" />
-      <signal name="Toggled" cname="toggled" when="FIRST">
+      <signal name="Toggled" cname="toggled" when="FIRST" field_name="toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCheckMenuItem*" name="check_menu_item" />
@@ -5162,7 +5162,7 @@
       </method>
     </object>
     <object name="Clipboard" cname="GtkClipboard" parent="GObject">
-      <signal name="OwnerChange" cname="owner_change" when="FIRST">
+      <signal name="OwnerChange" cname="owner_change" when="FIRST" field_name="owner_change">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkClipboard*" name="clipboard" />
@@ -5326,7 +5326,7 @@
       <property name="Title" cname="title" type="gchar*" readable="true" writeable="true" />
       <property name="Color" cname="color" type="GdkColor" readable="true" writeable="true" />
       <property name="Alpha" cname="alpha" type="guint" readable="true" writeable="true" />
-      <signal name="ColorSet" cname="color_set" when="FIRST">
+      <signal name="ColorSet" cname="color_set" when="FIRST" field_name="color_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkColorButton*" name="cp" />
@@ -5387,7 +5387,7 @@
       <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">
+      <signal name="ColorChanged" cname="color_changed" when="FIRST" field_name="color_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkColorSelection*" name="color_selection" />
@@ -5591,7 +5591,7 @@
     </object>
     <object name="ComboBox" cname="GtkComboBox" parent="GtkBin">
       <field name="Priv" cname="priv" type="GtkComboBoxPrivate*" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkComboBox*" name="combo_box" />
@@ -5798,27 +5798,27 @@
       <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="Add" cname="add" when="FIRST">
+      <signal name="Add" cname="add" when="FIRST" field_name="add">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Remove" cname="remove" when="FIRST">
+      <signal name="Remove" cname="remove" when="FIRST" field_name="remove">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="CheckResize" cname="check_resize" when="LAST">
+      <signal name="CheckResize" cname="check_resize" when="LAST" field_name="check_resize">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
         </parameters>
       </signal>
-      <signal name="SetFocusChild" cname="set-focus-child" when="FIRST">
+      <signal name="SetFocusChild" cname="set-focus-child" when="FIRST" field_name="set_focus_child">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
@@ -6089,7 +6089,7 @@
       <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">
+      <signal name="CurveTypeChanged" cname="curve_type_changed" when="FIRST" field_name="curve_type_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkCurve*" name="curve" />
@@ -6143,14 +6143,14 @@
       <field name="ActionArea" cname="action_area" type="GtkWidget*" access="public" />
       <field name="Separator" cname="separator" type="GtkWidget*" />
       <property name="HasSeparator" cname="has-separator" type="gboolean" readable="true" writeable="true" />
-      <signal name="Response" cname="response" when="LAST">
+      <signal name="Response" cname="response" when="LAST" field_name="response">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkDialog*" name="dialog" />
           <parameter type="gint" name="response_id" />
         </parameters>
       </signal>
-      <signal name="Close" cname="close" when="LAST">
+      <signal name="Close" cname="close" when="LAST" field_name="close">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkDialog*" name="dialog" />
@@ -6316,20 +6316,20 @@
       <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
       <property name="TruncateMultiline" cname="truncate-multiline" type="gboolean" readable="true" writeable="true" />
       <property name="ShadowType" cname="shadow-type" type="GtkShadowType" readable="true" writeable="true" />
-      <signal name="PopulatePopup" cname="populate_popup" when="LAST">
+      <signal name="PopulatePopup" cname="populate_popup" when="LAST" field_name="populate_popup">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
           <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </signal>
-      <signal name="Activate" cname="activate" when="LAST">
+      <signal name="Activate" cname="activate" when="LAST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
+      <signal name="MoveCursor" cname="move_cursor" when="LAST" field_name="move_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
@@ -6338,14 +6338,14 @@
           <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
-      <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST">
+      <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST" field_name="insert_at_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
           <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
-      <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST">
+      <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST" field_name="delete_from_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
@@ -6353,31 +6353,31 @@
           <parameter type="gint" name="count" />
         </parameters>
       </signal>
-      <signal name="Backspace" cname="backspace" when="LAST">
+      <signal name="Backspace" cname="backspace" when="LAST" field_name="backspace">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="CutClipboard" cname="cut_clipboard" when="LAST">
+      <signal name="CutClipboard" cname="cut_clipboard" when="LAST" field_name="cut_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST">
+      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST" field_name="copy_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="PasteClipboard" cname="paste_clipboard" when="LAST">
+      <signal name="PasteClipboard" cname="paste_clipboard" when="LAST" field_name="paste_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST">
+      <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST" field_name="toggle_overwrite">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
@@ -6551,14 +6551,14 @@
     </object>
     <object name="EntryCompletion" cname="GtkEntryCompletion" parent="GObject">
       <field name="Priv" cname="priv" type="GtkEntryCompletionPrivate*" />
-      <signal name="InsertPrefix" cname="insert_prefix" when="LAST">
+      <signal name="InsertPrefix" cname="insert_prefix" when="LAST" field_name="insert_prefix">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkEntryCompletion*" name="completion" />
           <parameter type="const-gchar*" name="prefix" />
         </parameters>
       </signal>
-      <signal name="MatchSelected" cname="match_selected" when="LAST">
+      <signal name="MatchSelected" cname="match_selected" when="LAST" field_name="match_selected">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkEntryCompletion*" name="completion" />
@@ -6566,7 +6566,7 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
-      <signal name="CursorOnMatch" cname="cursor_on_match" when="LAST">
+      <signal name="CursorOnMatch" cname="cursor_on_match" when="LAST" field_name="cursor_on_match">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkEntryCompletion*" name="completion" />
@@ -6574,7 +6574,7 @@
           <parameter type="GtkTreeIter*" name="iter" />
         </parameters>
       </signal>
-      <signal name="ActionActivated" cname="action_activated" when="LAST">
+      <signal name="ActionActivated" cname="action_activated" when="LAST" field_name="action_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntryCompletion*" name="completion" />
@@ -6744,7 +6744,7 @@
       <property name="UseMarkup" cname="use-markup" type="gboolean" readable="true" writeable="true" construct="true" />
       <property name="Spacing" cname="spacing" type="gint" readable="true" writeable="true" />
       <property name="LabelWidget" cname="label-widget" type="GtkWidget" readable="true" writeable="true" />
-      <signal name="Activate" cname="activate" when="LAST">
+      <signal name="Activate" cname="activate" when="LAST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkExpander*" name="expander" />
@@ -6823,7 +6823,7 @@
     </object>
     <object name="FileChooserButton" cname="GtkFileChooserButton" parent="GtkHBox">
       <field name="Priv" cname="priv" type="GtkFileChooserButtonPrivate*" />
-      <signal name="FileSet" cname="file-set" when="FIRST">
+      <signal name="FileSet" cname="file-set" when="FIRST" field_name="file_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFileChooserButton*" name="fc" />
@@ -7092,7 +7092,7 @@
       <property name="UseSize" cname="use-size" type="gboolean" readable="true" writeable="true" />
       <property name="ShowStyle" cname="show-style" type="gboolean" readable="true" writeable="true" />
       <property name="ShowSize" cname="show-size" type="gboolean" readable="true" writeable="true" />
-      <signal name="FontSet" cname="font-set" when="FIRST">
+      <signal name="FontSet" cname="font-set" when="FIRST" field_name="font_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkFontButton*" name="gfp" />
@@ -7351,14 +7351,14 @@
       <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">
+      <signal name="ChildAttached" cname="child_attached" when="FIRST" field_name="child_attached">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkHandleBox*" name="handle_box" />
           <parameter type="GtkWidget*" name="child" />
         </parameters>
       </signal>
-      <signal name="ChildDetached" cname="child_detached" when="FIRST">
+      <signal name="ChildDetached" cname="child_detached" when="FIRST" field_name="child_detached">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkHandleBox*" name="handle_box" />
@@ -7479,13 +7479,13 @@
     </object>
     <object name="HSV" cname="GtkHSV" parent="GtkWidget">
       <field name="Priv" cname="priv" type="gpointer" />
-      <signal name="Changed" cname="changed" when="FIRST">
+      <signal name="Changed" cname="changed" when="FIRST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkHSV*" name="hsv" />
         </parameters>
       </signal>
-      <signal name="Move" cname="move" when="LAST">
+      <signal name="Move" cname="move" when="LAST" field_name="move">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkHSV*" name="hsv" />
@@ -7575,7 +7575,7 @@
     </object>
     <object name="IconTheme" cname="GtkIconTheme" parent="GObject">
       <field name="Priv" cname="priv" type="GtkIconThemePrivate*" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconTheme*" name="icon_theme" />
@@ -7712,7 +7712,7 @@
       <property name="Orientation" cname="orientation" type="GtkOrientation" readable="true" writeable="true" />
       <property name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
       <property name="TooltipColumn" cname="tooltip-column" type="gint" readable="true" writeable="true" />
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST" field_name="set_scroll_adjustments">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
@@ -7720,50 +7720,50 @@
           <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
-      <signal name="ItemActivated" cname="item_activated" when="LAST">
+      <signal name="ItemActivated" cname="item_activated" when="LAST" field_name="item_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="SelectionChanged" cname="selection-changed" when="FIRST">
+      <signal name="SelectionChanged" cname="selection-changed" when="FIRST" field_name="selection_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="SelectAll" cname="select_all" when="LAST">
+      <signal name="SelectAll" cname="select_all" when="LAST" field_name="select_all">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="UnselectAll" cname="unselect_all" when="LAST">
+      <signal name="UnselectAll" cname="unselect_all" when="LAST" field_name="unselect_all">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="SelectCursorItem" cname="select_cursor_item" when="LAST">
+      <signal name="SelectCursorItem" cname="select_cursor_item" when="LAST" field_name="select_cursor_item">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="ToggleCursorItem" cname="toggle_cursor_item" when="LAST">
+      <signal name="ToggleCursorItem" cname="toggle_cursor_item" when="LAST" field_name="toggle_cursor_item">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="ActivateCursorItem" cname="activate_cursor_item" when="LAST">
+      <signal name="ActivateCursorItem" cname="activate_cursor_item" when="LAST" field_name="activate_cursor_item">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
         </parameters>
       </signal>
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
+      <signal name="MoveCursor" cname="move_cursor" when="LAST" field_name="move_cursor">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkIconView*" name="icon_view" />
@@ -8316,38 +8316,38 @@
       </method>
     </object>
     <object name="IMContext" cname="GtkIMContext" parent="GObject">
-      <signal name="PreeditStart" cname="preedit_start" when="LAST">
+      <signal name="PreeditStart" cname="preedit_start" when="LAST" field_name="preedit_start">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="PreeditEnd" cname="preedit_end" when="LAST">
+      <signal name="PreeditEnd" cname="preedit_end" when="LAST" field_name="preedit_end">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="PreeditChanged" cname="preedit_changed" when="LAST">
+      <signal name="PreeditChanged" cname="preedit_changed" when="LAST" field_name="preedit_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="Commit" cname="commit" when="LAST">
+      <signal name="Commit" cname="commit" when="LAST" field_name="commit">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
           <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
-      <signal name="RetrieveSurrounding" cname="retrieve_surrounding" when="LAST">
+      <signal name="RetrieveSurrounding" cname="retrieve_surrounding" when="LAST" field_name="retrieve_surrounding">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="DeleteSurrounding" cname="delete_surrounding" when="LAST">
+      <signal name="DeleteSurrounding" cname="delete_surrounding" when="LAST" field_name="delete_surrounding">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
@@ -8539,14 +8539,14 @@
       <field name="CurrentDevice" cname="current_device" type="GdkDevice*" />
       <field name="KeysList" cname="keys_list" type="GtkWidget*" />
       <field name="KeysListbox" cname="keys_listbox" type="GtkWidget*" />
-      <signal name="EnableDevice" cname="enable_device" when="LAST">
+      <signal name="EnableDevice" cname="enable_device" when="LAST" field_name="enable_device">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkInputDialog*" name="inputd" />
           <parameter type="GdkDevice*" name="device" />
         </parameters>
       </signal>
-      <signal name="DisableDevice" cname="disable_device" when="LAST">
+      <signal name="DisableDevice" cname="disable_device" when="LAST" field_name="disable_device">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkInputDialog*" name="inputd" />
@@ -8582,19 +8582,19 @@
       </method>
     </object>
     <object name="Item" cname="GtkItem" parent="GtkBin">
-      <signal name="Select" cname="select" when="FIRST">
+      <signal name="Select" cname="select" when="FIRST" field_name="select">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
-      <signal name="Deselect" cname="deselect" when="FIRST">
+      <signal name="Deselect" cname="deselect" when="FIRST" field_name="deselect">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
-      <signal name="Toggle" cname="toggle" when="FIRST">
+      <signal name="Toggle" cname="toggle" when="FIRST" field_name="toggle">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
@@ -8807,7 +8807,7 @@
       <field name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget*" />
       <field name="MnemonicWindow" cname="mnemonic_window" type="GtkWindow*" />
       <field name="SelectInfo" cname="select_info" type="GtkLabelSelectionInfo*" />
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
+      <signal name="MoveCursor" cname="move_cursor" when="LAST" field_name="move_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkLabel*" name="label" />
@@ -8816,13 +8816,13 @@
           <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
-      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST">
+      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST" field_name="copy_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkLabel*" name="label" />
         </parameters>
       </signal>
-      <signal name="PopulatePopup" cname="populate_popup" when="LAST">
+      <signal name="PopulatePopup" cname="populate_popup" when="LAST" field_name="populate_popup">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkLabel*" name="label" />
@@ -9076,7 +9076,7 @@
       <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="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST" field_name="set_scroll_adjustments">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkLayout*" name="layout" />
@@ -9549,26 +9549,26 @@
       <field name="TimerFromKeypress" cname="timer_from_keypress" bits="1" type="guint" />
       <field name="FromMenubar" cname="from_menubar" bits="1" type="guint" />
       <field name="Timer" cname="timer" type="guint" />
-      <signal name="Activate" cname="activate" when="FIRST">
+      <signal name="Activate" cname="activate" when="FIRST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
         </parameters>
       </signal>
-      <signal name="ActivateItem" cname="activate_item" when="FIRST">
+      <signal name="ActivateItem" cname="activate_item" when="FIRST" field_name="activate_item">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
         </parameters>
       </signal>
-      <signal name="ToggleSizeRequest" cname="toggle_size_request" when="FIRST">
+      <signal name="ToggleSizeRequest" cname="toggle_size_request" when="FIRST" field_name="toggle_size_request">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
           <parameter type="gint*" name="requisition" />
         </parameters>
       </signal>
-      <signal name="ToggleSizeAllocate" cname="toggle_size_allocate" when="FIRST">
+      <signal name="ToggleSizeAllocate" cname="toggle_size_allocate" when="FIRST" field_name="toggle_size_allocate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
@@ -9651,39 +9651,39 @@
       <field name="IgnoreLeave" cname="ignore_leave" bits="1" type="guint" />
       <field name="MenuFlag" cname="menu_flag" bits="1" type="guint" />
       <field name="IgnoreEnter" cname="ignore_enter" bits="1" type="guint" />
-      <signal name="Deactivate" cname="deactivate" when="FIRST">
+      <signal name="Deactivate" cname="deactivate" when="FIRST" field_name="deactivate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
-      <signal name="SelectionDone" cname="selection-done" when="FIRST">
+      <signal name="SelectionDone" cname="selection-done" when="FIRST" field_name="selection_done">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
-      <signal name="MoveCurrent" cname="move_current" when="LAST">
+      <signal name="MoveCurrent" cname="move_current" when="LAST" field_name="move_current">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
           <parameter type="GtkMenuDirectionType" name="direction" />
         </parameters>
       </signal>
-      <signal name="ActivateCurrent" cname="activate_current" when="LAST">
+      <signal name="ActivateCurrent" cname="activate_current" when="LAST" field_name="activate_current">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
           <parameter type="gboolean" name="force_hide" />
         </parameters>
       </signal>
-      <signal name="Cancel" cname="cancel" when="LAST">
+      <signal name="Cancel" cname="cancel" when="LAST" field_name="cancel">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
         </parameters>
       </signal>
-      <signal name="MoveSelected" cname="move_selected" when="LAST">
+      <signal name="MoveSelected" cname="move_selected" when="LAST" field_name="move_selected">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkMenuShell*" name="menu_shell" />
@@ -9774,7 +9774,7 @@
     </object>
     <object name="MenuToolButton" cname="GtkMenuToolButton" parent="GtkToolButton">
       <field name="Priv" cname="priv" type="GtkMenuToolButtonPrivate*" />
-      <signal name="ShowMenu" cname="show-menu" when="FIRST">
+      <signal name="ShowMenu" cname="show-menu" when="FIRST" field_name="show_menu">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuToolButton*" name="button" />
@@ -9972,7 +9972,7 @@
       <childprop name="TabPack" cname="tab-pack" type="GtkPackType" readable="true" writeable="true" />
       <childprop name="Reorderable" cname="reorderable" type="gboolean" readable="true" writeable="true" />
       <childprop name="Detachable" cname="detachable" type="gboolean" readable="true" writeable="true" />
-      <signal name="SwitchPage" cname="switch_page" when="LAST">
+      <signal name="SwitchPage" cname="switch_page" when="LAST" field_name="switch_page">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
@@ -9980,35 +9980,35 @@
           <parameter type="guint" name="page_num" />
         </parameters>
       </signal>
-      <signal name="FocusTab" cname="focus_tab" when="LAST">
+      <signal name="FocusTab" cname="focus_tab" when="LAST" field_name="focus_tab">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
           <parameter type="GtkNotebookTab" name="type" />
         </parameters>
       </signal>
-      <signal name="SelectPage" cname="select_page" when="LAST">
+      <signal name="SelectPage" cname="select_page" when="LAST" field_name="select_page">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
           <parameter type="gboolean" name="move_focus" />
         </parameters>
       </signal>
-      <signal name="ChangeCurrentPage" cname="change_current_page" when="LAST">
+      <signal name="ChangeCurrentPage" cname="change_current_page" when="LAST" field_name="change_current_page">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
           <parameter type="gint" name="offset" />
         </parameters>
       </signal>
-      <signal name="MoveFocusOut" cname="move_focus_out" when="LAST">
+      <signal name="MoveFocusOut" cname="move_focus_out" when="LAST" field_name="move_focus_out">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
           <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
-      <signal name="ReorderTab" cname="reorder_tab" when="LAST">
+      <signal name="ReorderTab" cname="reorder_tab" when="LAST" field_name="reorder_tab">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
@@ -10040,7 +10040,7 @@
           <parameter name="p1" type="guint32" />
         </parameters>
       </signal>
-      <signal name="CreateWindow" cname="create_window" when="LAST">
+      <signal name="CreateWindow" cname="create_window" when="LAST" field_name="create_window">
         <return-type type="GtkNotebook*" />
         <parameters>
           <parameter type="GtkNotebook*" name="notebook" />
@@ -10342,7 +10342,7 @@
     <object name="Object" cname="GtkObject" parent="GInitiallyUnowned">
       <field name="Flags" cname="flags" type="guint32" />
       <property name="UserData" cname="user-data" type="gpointer" readable="true" writeable="true" />
-      <signal name="Destroy" cname="destroy" when="CLEANUP">
+      <signal name="Destroy" cname="destroy" when="CLEANUP" field_name="destroy">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkObject*" name="object" />
@@ -10504,7 +10504,7 @@
       <field name="MenuItem" cname="menu_item" type="GtkWidget*" />
       <field name="Width" cname="width" type="guint16" />
       <field name="Height" cname="height" type="guint16" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkOptionMenu*" name="option_menu" />
@@ -10734,40 +10734,40 @@
       <property name="MaxPosition" cname="max-position" type="gint" readable="true" />
       <childprop name="Resize" cname="resize" type="gboolean" readable="true" writeable="true" />
       <childprop name="Shrink" cname="shrink" type="gboolean" readable="true" writeable="true" />
-      <signal name="CycleChildFocus" cname="cycle_child_focus" when="LAST">
+      <signal name="CycleChildFocus" cname="cycle_child_focus" when="LAST" field_name="cycle_child_focus">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
           <parameter type="gboolean" name="reverse" />
         </parameters>
       </signal>
-      <signal name="ToggleHandleFocus" cname="toggle_handle_focus" when="LAST">
+      <signal name="ToggleHandleFocus" cname="toggle_handle_focus" when="LAST" field_name="toggle_handle_focus">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
         </parameters>
       </signal>
-      <signal name="MoveHandle" cname="move_handle" when="LAST">
+      <signal name="MoveHandle" cname="move_handle" when="LAST" field_name="move_handle">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
           <parameter type="GtkScrollType" name="scroll" />
         </parameters>
       </signal>
-      <signal name="CycleHandleFocus" cname="cycle_handle_focus" when="LAST">
+      <signal name="CycleHandleFocus" cname="cycle_handle_focus" when="LAST" field_name="cycle_handle_focus">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
           <parameter type="gboolean" name="reverse" />
         </parameters>
       </signal>
-      <signal name="AcceptPosition" cname="accept_position" when="LAST">
+      <signal name="AcceptPosition" cname="accept_position" when="LAST" field_name="accept_position">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
         </parameters>
       </signal>
-      <signal name="CancelPosition" cname="cancel_position" when="LAST">
+      <signal name="CancelPosition" cname="cancel_position" when="LAST" field_name="cancel_position">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPaned*" name="paned" />
@@ -10835,7 +10835,7 @@
       <field name="GrabbedKeys" cname="grabbed_keys" type="GHashTable*" />
       <field name="SameApp" cname="same_app" bits="1" type="guint" />
       <property name="Embedded" cname="embedded" type="gboolean" readable="true" />
-      <signal name="Embedded" cname="embedded" when="LAST">
+      <signal name="Embedded" cname="embedded" when="LAST" field_name="embedded">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPlug*" name="plug" />
@@ -10883,7 +10883,7 @@
       <property name="Location" cname="location" type="gchar*" readable="true" />
       <property name="IconName" cname="icon-name" type="gchar*" readable="true" />
       <property name="JobCount" cname="job-count" type="gint" readable="true" />
-      <signal name="DetailsAcquired" cname="details-acquired" when="LAST">
+      <signal name="DetailsAcquired" cname="details-acquired" when="LAST" field_name="details_acquired">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrinter*" name="printer" />
@@ -11022,7 +11022,7 @@
       <field name="ChoicesDisplay" cname="choices_display" type="char**" />
       <field name="HasConflict" cname="has_conflict" type="gboolean" />
       <field name="Group" cname="group" type="char*" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrinterOption*" name="option" />
@@ -11071,7 +11071,7 @@
     <object name="PrinterOptionSet" cname="GtkPrinterOptionSet" parent="GObject">
       <field name="Array" cname="array" type="GPtrArray*" />
       <field name="Hash" cname="hash" type="GHashTable*" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrinterOptionSet*" name="option" />
@@ -11137,7 +11137,7 @@
     </object>
     <object name="PrinterOptionWidget" cname="GtkPrinterOptionWidget" parent="GtkHBox">
       <field name="Priv" cname="priv" type="GtkPrinterOptionWidgetPrivate*" />
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrinterOptionWidget*" name="widget" />
@@ -11170,33 +11170,33 @@
     </object>
     <object name="PrintBackend" cname="GtkPrintBackend" parent="GObject">
       <field name="Priv" cname="priv" type="GtkPrintBackendPrivate*" />
-      <signal name="PrinterListChanged" cname="printer-list-changed" when="LAST">
+      <signal name="PrinterListChanged" cname="printer-list-changed" when="LAST" field_name="printer_list_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintBackend*" name="backend" />
         </parameters>
       </signal>
-      <signal name="PrinterListDone" cname="printer-list-done" when="LAST">
+      <signal name="PrinterListDone" cname="printer-list-done" when="LAST" field_name="printer_list_done">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintBackend*" name="backend" />
         </parameters>
       </signal>
-      <signal name="PrinterAdded" cname="printer-added" when="LAST">
+      <signal name="PrinterAdded" cname="printer-added" when="LAST" field_name="printer_added">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintBackend*" name="backend" />
           <parameter type="GtkPrinter*" name="printer" />
         </parameters>
       </signal>
-      <signal name="PrinterRemoved" cname="printer-removed" when="LAST">
+      <signal name="PrinterRemoved" cname="printer-removed" when="LAST" field_name="printer_removed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintBackend*" name="backend" />
           <parameter type="GtkPrinter*" name="printer" />
         </parameters>
       </signal>
-      <signal name="PrinterStatusChanged" cname="printer-status-changed" when="LAST">
+      <signal name="PrinterStatusChanged" cname="printer-status-changed" when="LAST" field_name="printer_status_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintBackend*" name="backend" />
@@ -11397,7 +11397,7 @@
       <property name="Settings" cname="settings" type="GtkPrintSettings" readable="true" writeable="true" construct-only="true" />
       <property name="PageSetup" cname="page-setup" type="GtkPageSetup" readable="true" writeable="true" construct-only="true" />
       <property name="TrackPrintStatus" cname="track-print-status" type="gboolean" readable="true" writeable="true" />
-      <signal name="StatusChanged" cname="status-changed" when="LAST">
+      <signal name="StatusChanged" cname="status-changed" when="LAST" field_name="status_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintJob*" name="job" />
@@ -11459,28 +11459,28 @@
     </object>
     <object name="PrintOperation" cname="GtkPrintOperation" parent="GObject">
       <field name="Priv" cname="priv" type="GtkPrintOperationPrivate*" />
-      <signal name="Done" cname="done" when="LAST">
+      <signal name="Done" cname="done" when="LAST" field_name="done">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
           <parameter type="GtkPrintOperationResult" name="result" />
         </parameters>
       </signal>
-      <signal name="BeginPrint" cname="begin-print" when="LAST">
+      <signal name="BeginPrint" cname="begin-print" when="LAST" field_name="begin_print">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
           <parameter type="GtkPrintContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="Paginate" cname="paginate" when="LAST">
+      <signal name="Paginate" cname="paginate" when="LAST" field_name="paginate">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
           <parameter type="GtkPrintContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="RequestPageSetup" cname="request-page-setup" when="LAST">
+      <signal name="RequestPageSetup" cname="request-page-setup" when="LAST" field_name="request_page_setup">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
@@ -11489,7 +11489,7 @@
           <parameter type="GtkPageSetup*" name="setup" />
         </parameters>
       </signal>
-      <signal name="DrawPage" cname="draw-page" when="LAST">
+      <signal name="DrawPage" cname="draw-page" when="LAST" field_name="draw_page">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
@@ -11497,33 +11497,33 @@
           <parameter type="gint" name="page_nr" />
         </parameters>
       </signal>
-      <signal name="EndPrint" cname="end-print" when="LAST">
+      <signal name="EndPrint" cname="end-print" when="LAST" field_name="end_print">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
           <parameter type="GtkPrintContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="StatusChanged" cname="status-changed" when="LAST">
+      <signal name="StatusChanged" cname="status-changed" when="LAST" field_name="status_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
         </parameters>
       </signal>
-      <signal name="CreateCustomWidget" cname="create-custom-widget" when="LAST">
+      <signal name="CreateCustomWidget" cname="create-custom-widget" when="LAST" field_name="create_custom_widget">
         <return-type type="GtkWidget*" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
         </parameters>
       </signal>
-      <signal name="CustomWidgetApply" cname="custom-widget-apply" when="LAST">
+      <signal name="CustomWidgetApply" cname="custom-widget-apply" when="LAST" field_name="custom_widget_apply">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Preview" cname="preview" when="LAST">
+      <signal name="Preview" cname="preview" when="LAST" field_name="preview">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkPrintOperation*" name="operation" />
@@ -12181,7 +12181,7 @@
       <property name="Value" cname="value" type="gint" readable="true" writeable="true" />
       <property name="Group" cname="group" type="GtkRadioAction" writeable="true" />
       <property name="CurrentValue" cname="current-value" type="gint" readable="true" writeable="true" />
-      <signal name="Changed" cname="changed" when="FIRST">
+      <signal name="Changed" cname="changed" when="FIRST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRadioAction*" name="action" />
@@ -12222,7 +12222,7 @@
     <object name="RadioButton" cname="GtkRadioButton" parent="GtkCheckButton">
       <field name="Group" cname="group" type="GSList*" />
       <property name="Group" cname="group" type="GtkRadioButton" writeable="true" />
-      <signal name="GroupChanged" cname="group-changed" when="FIRST">
+      <signal name="GroupChanged" cname="group-changed" when="FIRST" field_name="group_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRadioButton*" name="radio_button" />
@@ -12278,7 +12278,7 @@
     <object name="RadioMenuItem" cname="GtkRadioMenuItem" parent="GtkCheckMenuItem">
       <field name="Group" cname="group" type="GSList*" />
       <property name="Group" cname="group" type="GtkRadioMenuItem" writeable="true" />
-      <signal name="GroupChanged" cname="group-changed" when="FIRST">
+      <signal name="GroupChanged" cname="group-changed" when="FIRST" field_name="group_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRadioMenuItem*" name="radio_menu_item" />
@@ -12393,27 +12393,27 @@
       <field name="SlideInitialCoordinate" cname="slide_initial_coordinate" type="gint" />
       <field name="UpdateTimeoutId" cname="update_timeout_id" type="guint" />
       <field name="EventWindow" cname="event_window" type="GdkWindow*" />
-      <signal name="ValueChanged" cname="value_changed" when="LAST">
+      <signal name="ValueChanged" cname="value_changed" when="LAST" field_name="value_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRange*" name="range" />
         </parameters>
       </signal>
-      <signal name="AdjustBounds" cname="adjust_bounds" when="LAST">
+      <signal name="AdjustBounds" cname="adjust_bounds" when="LAST" field_name="adjust_bounds">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRange*" name="range" />
           <parameter type="gdouble" name="new_value" />
         </parameters>
       </signal>
-      <signal name="MoveSlider" cname="move_slider" when="LAST">
+      <signal name="MoveSlider" cname="move_slider" when="LAST" field_name="move_slider">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRange*" name="range" />
           <parameter type="GtkScrollType" name="scroll" />
         </parameters>
       </signal>
-      <signal name="ChangeValue" cname="change_value" when="LAST">
+      <signal name="ChangeValue" cname="change_value" when="LAST" field_name="change_value">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkRange*" name="range" />
@@ -12781,7 +12781,7 @@
       <property name="Filename" cname="filename" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <property name="Limit" cname="limit" type="gint" readable="true" writeable="true" />
       <property name="Size" cname="size" type="gint" readable="true" />
-      <signal name="Changed" cname="changed" when="FIRST">
+      <signal name="Changed" cname="changed" when="FIRST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkRecentManager*" name="manager" />
@@ -12950,7 +12950,7 @@
       <field name="Digits" cname="digits" type="gint" />
       <field name="DrawValue" cname="draw_value" bits="1" type="guint" />
       <field name="ValuePos" cname="value_pos" bits="2" type="guint" />
-      <signal name="FormatValue" cname="format_value" when="LAST">
+      <signal name="FormatValue" cname="format_value" when="LAST" field_name="format_value">
         <return-type type="gchar*" />
         <parameters>
           <parameter type="GtkScale*" name="scale" />
@@ -13023,7 +13023,7 @@
       <property name="Size" cname="size" type="GtkIconSize" readable="true" writeable="true" />
       <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" />
       <property name="Icons" cname="icons" type="GStrv" readable="true" writeable="true" />
-      <signal name="ValueChanged" cname="value-changed" when="LAST">
+      <signal name="ValueChanged" cname="value-changed" when="LAST" field_name="value_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkScaleButton*" name="button" />
@@ -13089,7 +13089,7 @@
       <property name="WindowPlacement" cname="window-placement" type="GtkCornerType" readable="true" writeable="true" />
       <property name="WindowPlacementSet" cname="window-placement-set" type="gboolean" readable="true" writeable="true" />
       <property name="ShadowType" cname="shadow-type" type="GtkShadowType" readable="true" writeable="true" />
-      <signal name="ScrollChild" cname="scroll_child" when="LAST">
+      <signal name="ScrollChild" cname="scroll_child" when="LAST" field_name="scroll_child">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkScrolledWindow*" name="scrolled_window" />
@@ -13097,7 +13097,7 @@
           <parameter type="gboolean" name="horizontal" />
         </parameters>
       </signal>
-      <signal name="MoveFocusOut" cname="move_focus_out" when="LAST">
+      <signal name="MoveFocusOut" cname="move_focus_out" when="LAST" field_name="move_focus_out">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkScrolledWindow*" name="scrolled_window" />
@@ -13339,13 +13339,13 @@
       <field name="Active" cname="active" bits="1" type="guint" />
       <field name="AccelGroup" cname="accel_group" type="GtkAccelGroup*" />
       <field name="Toplevel" cname="toplevel" type="GtkWidget*" />
-      <signal name="PlugAdded" cname="plug_added" when="LAST">
+      <signal name="PlugAdded" cname="plug_added" when="LAST" field_name="plug_added">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkSocket*" name="socket_" />
         </parameters>
       </signal>
-      <signal name="PlugRemoved" cname="plug_removed" when="LAST">
+      <signal name="PlugRemoved" cname="plug_removed" when="LAST" field_name="plug_removed">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkSocket*" name="socket_" />
@@ -13395,32 +13395,32 @@
       <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">
+      <signal name="Input" cname="input" when="LAST" field_name="input">
         <return-type type="gint" />
         <parameters>
           <parameter type="GtkSpinButton*" name="spin_button" />
           <parameter type="gdouble*" name="new_value" />
         </parameters>
       </signal>
-      <signal name="Output" cname="output" when="LAST">
+      <signal name="Output" cname="output" when="LAST" field_name="output">
         <return-type type="gint" />
         <parameters>
           <parameter type="GtkSpinButton*" name="spin_button" />
         </parameters>
       </signal>
-      <signal name="ValueChanged" cname="value_changed" when="LAST">
+      <signal name="ValueChanged" cname="value_changed" when="LAST" field_name="value_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkSpinButton*" name="spin_button" />
         </parameters>
       </signal>
-      <signal name="Wrapped" cname="wrapped" when="LAST">
+      <signal name="Wrapped" cname="wrapped" when="LAST" field_name="wrapped">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkSpinButton*" name="spin_button" />
         </parameters>
       </signal>
-      <signal name="ChangeValue" cname="change_value" when="LAST">
+      <signal name="ChangeValue" cname="change_value" when="LAST" field_name="change_value">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkSpinButton*" name="spin_button" />
@@ -13570,7 +13570,7 @@
       <field name="GripWindow" cname="grip_window" type="GdkWindow*" />
       <field name="HasResizeGrip" cname="has_resize_grip" bits="1" type="guint" />
       <property name="HasResizeGrip" cname="has-resize-grip" type="gboolean" readable="true" writeable="true" />
-      <signal name="TextPushed" cname="text_pushed" when="LAST">
+      <signal name="TextPushed" cname="text_pushed" when="LAST" field_name="text_pushed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStatusbar*" name="statusbar" />
@@ -13578,7 +13578,7 @@
           <parameter type="const-gchar*" name="text" />
         </parameters>
       </signal>
-      <signal name="TextPopped" cname="text_popped" when="LAST">
+      <signal name="TextPopped" cname="text_popped" when="LAST" field_name="text_popped">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStatusbar*" name="statusbar" />
@@ -13639,13 +13639,13 @@
       <property name="Visible" cname="visible" type="gboolean" readable="true" writeable="true" />
       <property name="Embedded" cname="embedded" type="gboolean" readable="true" />
       <property name="Orientation" cname="orientation" type="GtkOrientation" readable="true" />
-      <signal name="Activate" cname="activate" when="FIRST">
+      <signal name="Activate" cname="activate" when="FIRST" field_name="activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStatusIcon*" name="status_icon" />
         </parameters>
       </signal>
-      <signal name="PopupMenu" cname="popup_menu" when="FIRST">
+      <signal name="PopupMenu" cname="popup_menu" when="FIRST" field_name="popup_menu">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStatusIcon*" name="status_icon" />
@@ -13653,7 +13653,7 @@
           <parameter type="guint32" name="activate_time" />
         </parameters>
       </signal>
-      <signal name="SizeChanged" cname="size_changed" when="LAST">
+      <signal name="SizeChanged" cname="size_changed" when="LAST" field_name="size_changed">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkStatusIcon*" name="status_icon" />
@@ -13812,13 +13812,13 @@
       <field name="Styles" cname="styles" type="GSList*" />
       <field name="PropertyCache" cname="property_cache" type="GArray*" />
       <field name="IconFactories" cname="icon_factories" type="GSList*" />
-      <signal name="Realize" cname="realize" when="FIRST">
+      <signal name="Realize" cname="realize" when="FIRST" field_name="realize">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStyle*" name="style" />
         </parameters>
       </signal>
-      <signal name="Unrealize" cname="unrealize" when="FIRST">
+      <signal name="Unrealize" cname="unrealize" when="FIRST" field_name="unrealize">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkStyle*" name="style" />
@@ -14415,7 +14415,7 @@
       <property name="CursorPosition" cname="cursor-position" type="gint" readable="true" />
       <property name="CopyTargetList" cname="copy-target-list" type="GtkTargetList" readable="true" />
       <property name="PasteTargetList" cname="paste-target-list" type="GtkTargetList" readable="true" />
-      <signal name="InsertText" cname="insert_text" when="LAST">
+      <signal name="InsertText" cname="insert_text" when="LAST" field_name="insert_text">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14424,7 +14424,7 @@
           <parameter type="gint" name="length" />
         </parameters>
       </signal>
-      <signal name="InsertPixbuf" cname="insert_pixbuf" when="LAST">
+      <signal name="InsertPixbuf" cname="insert_pixbuf" when="LAST" field_name="insert_pixbuf">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14432,7 +14432,7 @@
           <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </signal>
-      <signal name="InsertChildAnchor" cname="insert_child_anchor" when="LAST">
+      <signal name="InsertChildAnchor" cname="insert_child_anchor" when="LAST" field_name="insert_child_anchor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14440,7 +14440,7 @@
           <parameter type="GtkTextChildAnchor*" name="anchor" />
         </parameters>
       </signal>
-      <signal name="DeleteRange" cname="delete_range" when="LAST">
+      <signal name="DeleteRange" cname="delete_range" when="LAST" field_name="delete_range">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14448,19 +14448,19 @@
           <parameter type="GtkTextIter*" name="end" />
         </parameters>
       </signal>
-      <signal name="Changed" cname="changed" when="LAST">
+      <signal name="Changed" cname="changed" when="LAST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
-      <signal name="ModifiedChanged" cname="modified_changed" when="LAST">
+      <signal name="ModifiedChanged" cname="modified_changed" when="LAST" field_name="modified_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
-      <signal name="MarkSet" cname="mark_set" when="LAST">
+      <signal name="MarkSet" cname="mark_set" when="LAST" field_name="mark_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14468,14 +14468,14 @@
           <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </signal>
-      <signal name="MarkDeleted" cname="mark_deleted" when="LAST">
+      <signal name="MarkDeleted" cname="mark_deleted" when="LAST" field_name="mark_deleted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
           <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </signal>
-      <signal name="ApplyTag" cname="apply_tag" when="LAST">
+      <signal name="ApplyTag" cname="apply_tag" when="LAST" field_name="apply_tag">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14484,7 +14484,7 @@
           <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
-      <signal name="RemoveTag" cname="remove_tag" when="LAST">
+      <signal name="RemoveTag" cname="remove_tag" when="LAST" field_name="remove_tag">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -14493,13 +14493,13 @@
           <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
-      <signal name="BeginUserAction" cname="begin_user_action" when="LAST">
+      <signal name="BeginUserAction" cname="begin_user_action" when="LAST" field_name="begin_user_action">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
         </parameters>
       </signal>
-      <signal name="EndUserAction" cname="end_user_action" when="LAST">
+      <signal name="EndUserAction" cname="end_user_action" when="LAST" field_name="end_user_action">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -15107,7 +15107,7 @@
       <property name="ParagraphBackground" cname="paragraph-background" type="gchar*" writeable="true" />
       <property name="ParagraphBackgroundGdk" cname="paragraph-background-gdk" type="GdkColor" readable="true" writeable="true" />
       <property name="AccumulativeMargin" cname="accumulative-margin" type="gboolean" readable="true" writeable="true" />
-      <signal name="Event" cname="event" when="LAST">
+      <signal name="Event" cname="event" when="LAST" field_name="event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTextTag*" name="tag" />
@@ -15147,7 +15147,7 @@
       <field name="Anonymous" cname="anonymous" type="GSList*" />
       <field name="AnonCount" cname="anon_count" type="gint" />
       <field name="Buffers" cname="buffers" type="GSList*" />
-      <signal name="TagChanged" cname="tag_changed" when="LAST">
+      <signal name="TagChanged" cname="tag_changed" when="LAST" field_name="tag_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextTagTable*" name="table" />
@@ -15155,14 +15155,14 @@
           <parameter type="gboolean" name="size_changed" />
         </parameters>
       </signal>
-      <signal name="TagAdded" cname="tag_added" when="LAST">
+      <signal name="TagAdded" cname="tag_added" when="LAST" field_name="tag_added">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextTagTable*" name="table" />
           <parameter type="GtkTextTag*" name="tag" />
         </parameters>
       </signal>
-      <signal name="TagRemoved" cname="tag_removed" when="LAST">
+      <signal name="TagRemoved" cname="tag_removed" when="LAST" field_name="tag_removed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextTagTable*" name="table" />
@@ -15264,7 +15264,7 @@
       <property name="Buffer" cname="buffer" type="GtkTextBuffer" readable="true" writeable="true" />
       <property name="Overwrite" cname="overwrite" type="gboolean" readable="true" writeable="true" />
       <property name="AcceptsTab" cname="accepts-tab" type="gboolean" readable="true" writeable="true" />
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
+      <signal name="MoveCursor" cname="move_cursor" when="LAST" field_name="move_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -15273,7 +15273,7 @@
           <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
-      <signal name="PageHorizontally" cname="page_horizontally" when="LAST">
+      <signal name="PageHorizontally" cname="page_horizontally" when="LAST" field_name="page_horizontally">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -15281,20 +15281,20 @@
           <parameter type="gboolean" name="extend_selection" />
         </parameters>
       </signal>
-      <signal name="SetAnchor" cname="set_anchor" when="LAST">
+      <signal name="SetAnchor" cname="set_anchor" when="LAST" field_name="set_anchor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST">
+      <signal name="InsertAtCursor" cname="insert_at_cursor" when="LAST" field_name="insert_at_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
           <parameter type="const-gchar*" name="str" />
         </parameters>
       </signal>
-      <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST">
+      <signal name="DeleteFromCursor" cname="delete_from_cursor" when="LAST" field_name="delete_from_cursor">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -15302,37 +15302,37 @@
           <parameter type="gint" name="count" />
         </parameters>
       </signal>
-      <signal name="Backspace" cname="backspace" when="LAST">
+      <signal name="Backspace" cname="backspace" when="LAST" field_name="backspace">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="CutClipboard" cname="cut_clipboard" when="LAST">
+      <signal name="CutClipboard" cname="cut_clipboard" when="LAST" field_name="cut_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST">
+      <signal name="CopyClipboard" cname="copy_clipboard" when="LAST" field_name="copy_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="PasteClipboard" cname="paste_clipboard" when="LAST">
+      <signal name="PasteClipboard" cname="paste_clipboard" when="LAST" field_name="paste_clipboard">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST">
+      <signal name="ToggleOverwrite" cname="toggle_overwrite" when="LAST" field_name="toggle_overwrite">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
         </parameters>
       </signal>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST" field_name="set_scroll_adjustments">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -15340,7 +15340,7 @@
           <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
-      <signal name="PopulatePopup" cname="populate_popup" when="LAST">
+      <signal name="PopulatePopup" cname="populate_popup" when="LAST" field_name="populate_popup">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextView*" name="text_view" />
@@ -15684,7 +15684,7 @@
       <field name="PrivateData" cname="private_data" type="GtkToggleActionPrivate*" />
       <property name="DrawAsRadio" cname="draw-as-radio" type="gboolean" readable="true" writeable="true" />
       <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
-      <signal name="Toggled" cname="toggled" when="FIRST">
+      <signal name="Toggled" cname="toggled" when="FIRST" field_name="toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToggleAction*" name="action" />
@@ -15730,7 +15730,7 @@
       <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">
+      <signal name="Toggled" cname="toggled" when="FIRST" field_name="toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToggleButton*" name="toggle_button" />
@@ -15784,7 +15784,7 @@
     <object name="ToggleToolButton" cname="GtkToggleToolButton" parent="GtkToolButton">
       <field name="Priv" cname="priv" type="GtkToggleToolButtonPrivate*" />
       <property name="Active" cname="active" type="gboolean" readable="true" writeable="true" />
-      <signal name="Toggled" cname="toggled" when="FIRST">
+      <signal name="Toggled" cname="toggled" when="FIRST" field_name="toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToggleToolButton*" name="button" />
@@ -15823,21 +15823,21 @@
       <field name="GtkReserved2" cname="_gtk_reserved2" type="guint" />
       <field name="StyleSet" cname="style_set" bits="1" type="guint" />
       <field name="IconSizeSet" cname="icon_size_set" bits="1" type="guint" />
-      <signal name="OrientationChanged" cname="orientation-changed" when="FIRST">
+      <signal name="OrientationChanged" cname="orientation-changed" when="FIRST" field_name="orientation_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToolbar*" name="toolbar" />
           <parameter type="GtkOrientation" name="orientation" />
         </parameters>
       </signal>
-      <signal name="StyleChanged" cname="style-changed" when="FIRST">
+      <signal name="StyleChanged" cname="style-changed" when="FIRST" field_name="style_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToolbar*" name="toolbar" />
           <parameter type="GtkToolbarStyle" name="style" />
         </parameters>
       </signal>
-      <signal name="PopupContextMenu" cname="popup_context_menu" when="LAST">
+      <signal name="PopupContextMenu" cname="popup_context_menu" when="LAST" field_name="popup_context_menu">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkToolbar*" name="toolbar" />
@@ -16180,7 +16180,7 @@
       <property name="StockId" cname="stock-id" type="gchar*" readable="true" writeable="true" />
       <property name="IconName" cname="icon-name" type="gchar*" readable="true" writeable="true" />
       <property name="IconWidget" cname="icon-widget" type="GtkWidget" readable="true" writeable="true" />
-      <signal name="Clicked" cname="clicked" when="FIRST">
+      <signal name="Clicked" cname="clicked" when="FIRST" field_name="clicked">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToolButton*" name="tool_item" />
@@ -16260,19 +16260,19 @@
       <property name="VisibleHorizontal" cname="visible-horizontal" type="gboolean" readable="true" writeable="true" />
       <property name="VisibleVertical" cname="visible-vertical" type="gboolean" readable="true" writeable="true" />
       <property name="IsImportant" cname="is-important" type="gboolean" readable="true" writeable="true" />
-      <signal name="CreateMenuProxy" cname="create_menu_proxy" when="LAST">
+      <signal name="CreateMenuProxy" cname="create_menu_proxy" when="LAST" field_name="create_menu_proxy">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkToolItem*" name="tool_item" />
         </parameters>
       </signal>
-      <signal name="ToolbarReconfigured" cname="toolbar_reconfigured" when="LAST">
+      <signal name="ToolbarReconfigured" cname="toolbar_reconfigured" when="LAST" field_name="toolbar_reconfigured">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkToolItem*" name="tool_item" />
         </parameters>
       </signal>
-      <signal name="SetTooltip" cname="set_tooltip" when="LAST">
+      <signal name="SetTooltip" cname="set_tooltip" when="LAST" field_name="set_tooltip">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkToolItem*" name="tool_item" />
@@ -16554,7 +16554,7 @@
       <field name="UserFunc" cname="user_func" type="GtkTreeSelectionFunc" />
       <field name="UserData" cname="user_data" type="gpointer" />
       <field name="Destroy" cname="destroy" type="GtkDestroyNotify" />
-      <signal name="Changed" cname="changed" when="FIRST">
+      <signal name="Changed" cname="changed" when="FIRST" field_name="changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeSelection*" name="selection" />
@@ -16875,7 +16875,7 @@
       <property name="EnableGridLines" cname="enable-grid-lines" type="GtkTreeViewGridLines" readable="true" writeable="true" />
       <property name="EnableTreeLines" cname="enable-tree-lines" type="gboolean" readable="true" writeable="true" />
       <property name="TooltipColumn" cname="tooltip-column" type="gint" readable="true" writeable="true" />
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST" field_name="set_scroll_adjustments">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16883,7 +16883,7 @@
           <parameter type="GtkAdjustment*" name="vadjustment" />
         </parameters>
       </signal>
-      <signal name="RowActivated" cname="row_activated" when="LAST">
+      <signal name="RowActivated" cname="row_activated" when="LAST" field_name="row_activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16891,7 +16891,7 @@
           <parameter type="GtkTreeViewColumn*" name="column" />
         </parameters>
       </signal>
-      <signal name="TestExpandRow" cname="test-expand-row" when="LAST">
+      <signal name="TestExpandRow" cname="test-expand-row" when="LAST" field_name="test_expand_row">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16899,7 +16899,7 @@
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="TestCollapseRow" cname="test-collapse-row" when="LAST">
+      <signal name="TestCollapseRow" cname="test-collapse-row" when="LAST" field_name="test_collapse_row">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16907,7 +16907,7 @@
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="RowExpanded" cname="row-expanded" when="LAST">
+      <signal name="RowExpanded" cname="row-expanded" when="LAST" field_name="row_expanded">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16915,7 +16915,7 @@
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="RowCollapsed" cname="row-collapsed" when="LAST">
+      <signal name="RowCollapsed" cname="row-collapsed" when="LAST" field_name="row_collapsed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16923,19 +16923,19 @@
           <parameter type="GtkTreePath*" name="path" />
         </parameters>
       </signal>
-      <signal name="ColumnsChanged" cname="columns-changed" when="LAST">
+      <signal name="ColumnsChanged" cname="columns-changed" when="LAST" field_name="columns_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="CursorChanged" cname="cursor-changed" when="LAST">
+      <signal name="CursorChanged" cname="cursor-changed" when="LAST" field_name="cursor_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
+      <signal name="MoveCursor" cname="move_cursor" when="LAST" field_name="move_cursor">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16943,32 +16943,32 @@
           <parameter type="gint" name="count" />
         </parameters>
       </signal>
-      <signal name="SelectAll" cname="select_all" when="LAST">
+      <signal name="SelectAll" cname="select_all" when="LAST" field_name="select_all">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="UnselectAll" cname="unselect_all" when="LAST">
+      <signal name="UnselectAll" cname="unselect_all" when="LAST" field_name="unselect_all">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="SelectCursorRow" cname="select_cursor_row" when="LAST">
+      <signal name="SelectCursorRow" cname="select_cursor_row" when="LAST" field_name="select_cursor_row">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
           <parameter type="gboolean" name="start_editing" />
         </parameters>
       </signal>
-      <signal name="ToggleCursorRow" cname="toggle_cursor_row" when="LAST">
+      <signal name="ToggleCursorRow" cname="toggle_cursor_row" when="LAST" field_name="toggle_cursor_row">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="ExpandCollapseCursorRow" cname="expand_collapse_cursor_row" when="LAST">
+      <signal name="ExpandCollapseCursorRow" cname="expand_collapse_cursor_row" when="LAST" field_name="expand_collapse_cursor_row">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -16977,13 +16977,13 @@
           <parameter type="gboolean" name="open_all" />
         </parameters>
       </signal>
-      <signal name="SelectCursorParent" cname="select_cursor_parent" when="LAST">
+      <signal name="SelectCursorParent" cname="select_cursor_parent" when="LAST" field_name="select_cursor_parent">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
         </parameters>
       </signal>
-      <signal name="StartInteractiveSearch" cname="start_interactive_search" when="LAST">
+      <signal name="StartInteractiveSearch" cname="start_interactive_search" when="LAST" field_name="start_interactive_search">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view" />
@@ -17614,7 +17614,7 @@
       <field name="Reorderable" cname="reorderable" bits="1" type="guint" />
       <field name="UseResizedWidth" cname="use_resized_width" bits="1" type="guint" />
       <field name="Expand" cname="expand" bits="1" type="guint" />
-      <signal name="Clicked" cname="clicked" when="LAST">
+      <signal name="Clicked" cname="clicked" when="LAST" field_name="clicked">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTreeViewColumn*" name="tree_column" />
@@ -17898,20 +17898,20 @@
       <field name="PrivateData" cname="private_data" type="GtkUIManagerPrivate*" />
       <property name="AddTearoffs" cname="add-tearoffs" type="gboolean" readable="true" writeable="true" />
       <property name="Ui" cname="ui" type="gchar*" readable="true" />
-      <signal name="AddWidget" cname="add_widget" when="FIRST">
+      <signal name="AddWidget" cname="add_widget" when="FIRST" field_name="add_widget">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="ActionsChanged" cname="actions_changed" when="FIRST">
+      <signal name="ActionsChanged" cname="actions_changed" when="FIRST" field_name="actions_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
         </parameters>
       </signal>
-      <signal name="ConnectProxy" cname="connect_proxy" when="FIRST">
+      <signal name="ConnectProxy" cname="connect_proxy" when="FIRST" field_name="connect_proxy">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
@@ -17919,7 +17919,7 @@
           <parameter type="GtkWidget*" name="proxy" />
         </parameters>
       </signal>
-      <signal name="DisconnectProxy" cname="disconnect_proxy" when="FIRST">
+      <signal name="DisconnectProxy" cname="disconnect_proxy" when="FIRST" field_name="disconnect_proxy">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
@@ -17927,14 +17927,14 @@
           <parameter type="GtkWidget*" name="proxy" />
         </parameters>
       </signal>
-      <signal name="PreActivate" cname="pre_activate" when="FIRST">
+      <signal name="PreActivate" cname="pre_activate" when="FIRST" field_name="pre_activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
           <parameter type="GtkAction*" name="action" />
         </parameters>
       </signal>
-      <signal name="PostActivate" cname="post_activate" when="FIRST">
+      <signal name="PostActivate" cname="post_activate" when="FIRST" field_name="post_activate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkUIManager*" name="merge" />
@@ -18096,7 +18096,7 @@
       <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct="true" />
       <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct="true" />
       <property name="ShadowType" cname="shadow-type" type="GtkShadowType" readable="true" writeable="true" />
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST" field_name="set_scroll_adjustments">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkViewport*" name="viewport" />
@@ -18223,126 +18223,126 @@
       <property name="HasTooltip" cname="has-tooltip" type="gboolean" readable="true" writeable="true" />
       <property name="TooltipText" cname="tooltip-text" type="gchar*" readable="true" writeable="true" />
       <property name="TooltipMarkup" cname="tooltip-markup" type="gchar*" readable="true" writeable="true" />
-      <signal name="Show" cname="show" when="FIRST">
+      <signal name="Show" cname="show" when="FIRST" field_name="show">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Hide" cname="hide" when="FIRST">
+      <signal name="Hide" cname="hide" when="FIRST" field_name="hide">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Map" cname="map" when="FIRST">
+      <signal name="Map" cname="map" when="FIRST" field_name="map">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Unmap" cname="unmap" when="FIRST">
+      <signal name="Unmap" cname="unmap" when="FIRST" field_name="unmap">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Realize" cname="realize" when="FIRST">
+      <signal name="Realize" cname="realize" when="FIRST" field_name="realize">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Unrealize" cname="unrealize" when="LAST">
+      <signal name="Unrealize" cname="unrealize" when="LAST" field_name="unrealize">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="SizeRequest" cname="size_request" when="FIRST">
+      <signal name="SizeRequest" cname="size_request" when="FIRST" field_name="size_request">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkRequisition*" name="requisition" />
         </parameters>
       </signal>
-      <signal name="SizeAllocate" cname="size_allocate" when="FIRST">
+      <signal name="SizeAllocate" cname="size_allocate" when="FIRST" field_name="size_allocate">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkAllocation*" name="allocation" />
         </parameters>
       </signal>
-      <signal name="StateChanged" cname="state_changed" when="FIRST">
+      <signal name="StateChanged" cname="state_changed" when="FIRST" field_name="state_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkStateType" name="previous_state" />
         </parameters>
       </signal>
-      <signal name="ParentSet" cname="parent_set" when="FIRST">
+      <signal name="ParentSet" cname="parent_set" when="FIRST" field_name="parent_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkWidget*" name="previous_parent" />
         </parameters>
       </signal>
-      <signal name="HierarchyChanged" cname="hierarchy_changed" when="LAST">
+      <signal name="HierarchyChanged" cname="hierarchy_changed" when="LAST" field_name="hierarchy_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkWidget*" name="previous_toplevel" />
         </parameters>
       </signal>
-      <signal name="StyleSet" cname="style_set" when="FIRST">
+      <signal name="StyleSet" cname="style_set" when="FIRST" field_name="style_set">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkStyle*" name="previous_style" />
         </parameters>
       </signal>
-      <signal name="DirectionChanged" cname="direction_changed" when="FIRST">
+      <signal name="DirectionChanged" cname="direction_changed" when="FIRST" field_name="direction_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkTextDirection" name="previous_direction" />
         </parameters>
       </signal>
-      <signal name="GrabNotify" cname="grab_notify" when="FIRST">
+      <signal name="GrabNotify" cname="grab_notify" when="FIRST" field_name="grab_notify">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="gboolean" name="was_grabbed" />
         </parameters>
       </signal>
-      <signal name="ChildNotify" cname="child_notify" when="FIRST">
+      <signal name="ChildNotify" cname="child_notify" when="FIRST" field_name="child_notify">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </signal>
-      <signal name="MnemonicActivate" cname="mnemonic_activate" when="LAST">
+      <signal name="MnemonicActivate" cname="mnemonic_activate" when="LAST" field_name="mnemonic_activate">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="gboolean" name="group_cycling" />
         </parameters>
       </signal>
-      <signal name="GrabFocus" cname="grab_focus" when="LAST">
+      <signal name="GrabFocus" cname="grab_focus" when="LAST" field_name="grab_focus">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Focus" cname="focus" when="LAST">
+      <signal name="Focus" cname="focus" when="LAST" field_name="focus">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
-      <signal name="Event" cname="event" when="LAST">
+      <signal name="Event" cname="event" when="LAST" field_name="event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18356,153 +18356,153 @@
           <parameter name="p0" type="GdkEvent" />
         </parameters>
       </signal>
-      <signal name="ButtonPressEvent" cname="button_press_event" when="LAST">
+      <signal name="ButtonPressEvent" cname="button_press_event" when="LAST" field_name="button_press_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventButton*" name="event" />
         </parameters>
       </signal>
-      <signal name="ButtonReleaseEvent" cname="button_release_event" when="LAST">
+      <signal name="ButtonReleaseEvent" cname="button_release_event" when="LAST" field_name="button_release_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventButton*" name="event" />
         </parameters>
       </signal>
-      <signal name="ScrollEvent" cname="scroll_event" when="LAST">
+      <signal name="ScrollEvent" cname="scroll_event" when="LAST" field_name="scroll_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventScroll*" name="event" />
         </parameters>
       </signal>
-      <signal name="MotionNotifyEvent" cname="motion_notify_event" when="LAST">
+      <signal name="MotionNotifyEvent" cname="motion_notify_event" when="LAST" field_name="motion_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventMotion*" name="event" />
         </parameters>
       </signal>
-      <signal name="CompositedChanged" cname="composited_changed" when="LAST">
+      <signal name="CompositedChanged" cname="composited_changed" when="LAST" field_name="composited_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="DeleteEvent" cname="delete_event" when="LAST">
+      <signal name="DeleteEvent" cname="delete_event" when="LAST" field_name="delete_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
-      <signal name="DestroyEvent" cname="destroy_event" when="LAST">
+      <signal name="DestroyEvent" cname="destroy_event" when="LAST" field_name="destroy_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
-      <signal name="ExposeEvent" cname="expose_event" when="LAST">
+      <signal name="ExposeEvent" cname="expose_event" when="LAST" field_name="expose_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventExpose*" name="event" />
         </parameters>
       </signal>
-      <signal name="KeyPressEvent" cname="key_press_event" when="LAST">
+      <signal name="KeyPressEvent" cname="key_press_event" when="LAST" field_name="key_press_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventKey*" name="event" />
         </parameters>
       </signal>
-      <signal name="KeyReleaseEvent" cname="key_release_event" when="LAST">
+      <signal name="KeyReleaseEvent" cname="key_release_event" when="LAST" field_name="key_release_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventKey*" name="event" />
         </parameters>
       </signal>
-      <signal name="EnterNotifyEvent" cname="enter_notify_event" when="LAST">
+      <signal name="EnterNotifyEvent" cname="enter_notify_event" when="LAST" field_name="enter_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventCrossing*" name="event" />
         </parameters>
       </signal>
-      <signal name="LeaveNotifyEvent" cname="leave_notify_event" when="LAST">
+      <signal name="LeaveNotifyEvent" cname="leave_notify_event" when="LAST" field_name="leave_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventCrossing*" name="event" />
         </parameters>
       </signal>
-      <signal name="ConfigureEvent" cname="configure_event" when="LAST">
+      <signal name="ConfigureEvent" cname="configure_event" when="LAST" field_name="configure_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventConfigure*" name="event" />
         </parameters>
       </signal>
-      <signal name="FocusInEvent" cname="focus_in_event" when="LAST">
+      <signal name="FocusInEvent" cname="focus_in_event" when="LAST" field_name="focus_in_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventFocus*" name="event" />
         </parameters>
       </signal>
-      <signal name="FocusOutEvent" cname="focus_out_event" when="LAST">
+      <signal name="FocusOutEvent" cname="focus_out_event" when="LAST" field_name="focus_out_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventFocus*" name="event" />
         </parameters>
       </signal>
-      <signal name="MapEvent" cname="map_event" when="LAST">
+      <signal name="MapEvent" cname="map_event" when="LAST" field_name="map_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
-      <signal name="UnmapEvent" cname="unmap_event" when="LAST">
+      <signal name="UnmapEvent" cname="unmap_event" when="LAST" field_name="unmap_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
-      <signal name="PropertyNotifyEvent" cname="property_notify_event" when="LAST">
+      <signal name="PropertyNotifyEvent" cname="property_notify_event" when="LAST" field_name="property_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventProperty*" name="event" />
         </parameters>
       </signal>
-      <signal name="SelectionClearEvent" cname="selection_clear_event" when="LAST">
+      <signal name="SelectionClearEvent" cname="selection_clear_event" when="LAST" field_name="selection_clear_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
-      <signal name="SelectionRequestEvent" cname="selection_request_event" when="LAST">
+      <signal name="SelectionRequestEvent" cname="selection_request_event" when="LAST" field_name="selection_request_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
-      <signal name="SelectionNotifyEvent" cname="selection_notify_event" when="LAST">
+      <signal name="SelectionNotifyEvent" cname="selection_notify_event" when="LAST" field_name="selection_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventSelection*" name="event" />
         </parameters>
       </signal>
-      <signal name="SelectionReceived" cname="selection_received" when="LAST">
+      <signal name="SelectionReceived" cname="selection_received" when="LAST" field_name="selection_received">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18510,7 +18510,7 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="SelectionGet" cname="selection_get" when="LAST">
+      <signal name="SelectionGet" cname="selection_get" when="LAST" field_name="selection_get">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18519,21 +18519,21 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="ProximityInEvent" cname="proximity_in_event" when="LAST">
+      <signal name="ProximityInEvent" cname="proximity_in_event" when="LAST" field_name="proximity_in_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventProximity*" name="event" />
         </parameters>
       </signal>
-      <signal name="ProximityOutEvent" cname="proximity_out_event" when="LAST">
+      <signal name="ProximityOutEvent" cname="proximity_out_event" when="LAST" field_name="proximity_out_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventProximity*" name="event" />
         </parameters>
       </signal>
-      <signal name="DragLeave" cname="drag_leave" when="LAST">
+      <signal name="DragLeave" cname="drag_leave" when="LAST" field_name="drag_leave">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18541,21 +18541,21 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="DragBegin" cname="drag_begin" when="LAST">
+      <signal name="DragBegin" cname="drag_begin" when="LAST" field_name="drag_begin">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="DragEnd" cname="drag_end" when="LAST">
+      <signal name="DragEnd" cname="drag_end" when="LAST" field_name="drag_end">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkDragContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="DragDataDelete" cname="drag_data_delete" when="LAST">
+      <signal name="DragDataDelete" cname="drag_data_delete" when="LAST" field_name="drag_data_delete">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18570,7 +18570,7 @@
           <parameter name="p1" type="GtkDragResult" />
         </parameters>
       </signal>
-      <signal name="DragMotion" cname="drag_motion" when="LAST">
+      <signal name="DragMotion" cname="drag_motion" when="LAST" field_name="drag_motion">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18580,7 +18580,7 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="DragDrop" cname="drag_drop" when="LAST">
+      <signal name="DragDrop" cname="drag_drop" when="LAST" field_name="drag_drop">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18590,7 +18590,7 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="DragDataGet" cname="drag_data_get" when="LAST">
+      <signal name="DragDataGet" cname="drag_data_get" when="LAST" field_name="drag_data_get">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18600,7 +18600,7 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="DragDataReceived" cname="drag_data_received" when="LAST">
+      <signal name="DragDataReceived" cname="drag_data_received" when="LAST" field_name="drag_data_received">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18612,42 +18612,42 @@
           <parameter type="guint" name="time_" />
         </parameters>
       </signal>
-      <signal name="VisibilityNotifyEvent" cname="visibility_notify_event" when="LAST">
+      <signal name="VisibilityNotifyEvent" cname="visibility_notify_event" when="LAST" field_name="visibility_notify_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventVisibility*" name="event" />
         </parameters>
       </signal>
-      <signal name="ClientEvent" cname="client_event" when="LAST">
+      <signal name="ClientEvent" cname="client_event" when="LAST" field_name="client_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventClient*" name="event" />
         </parameters>
       </signal>
-      <signal name="NoExposeEvent" cname="no_expose_event" when="LAST">
+      <signal name="NoExposeEvent" cname="no_expose_event" when="LAST" field_name="no_expose_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventAny*" name="event" />
         </parameters>
       </signal>
-      <signal name="WindowStateEvent" cname="window_state_event" when="LAST">
+      <signal name="WindowStateEvent" cname="window_state_event" when="LAST" field_name="window_state_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventWindowState*" name="event" />
         </parameters>
       </signal>
-      <signal name="GrabBrokenEvent" cname="grab_broken_event" when="LAST">
+      <signal name="GrabBrokenEvent" cname="grab_broken_event" when="LAST" field_name="grab_broken_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkEventGrabBroken*" name="event" />
         </parameters>
       </signal>
-      <signal name="QueryTooltip" cname="query-tooltip" when="LAST">
+      <signal name="QueryTooltip" cname="query-tooltip" when="LAST" field_name="query_tooltip">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18657,13 +18657,13 @@
           <parameter type="GtkTooltip*" name="tooltip" />
         </parameters>
       </signal>
-      <signal name="PopupMenu" cname="popup_menu" when="LAST">
+      <signal name="PopupMenu" cname="popup_menu" when="LAST" field_name="popup_menu">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="ShowHelp" cname="show_help" when="LAST">
+      <signal name="ShowHelp" cname="show_help" when="LAST" field_name="show_help">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -18676,14 +18676,14 @@
           <parameter name="inst" type="GtkWidget*" />
         </parameters>
       </signal>
-      <signal name="ScreenChanged" cname="screen_changed" when="LAST">
+      <signal name="ScreenChanged" cname="screen_changed" when="LAST" field_name="screen_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GdkScreen*" name="previous_screen" />
         </parameters>
       </signal>
-      <signal name="CanActivateAccel" cname="can_activate_accel" when="LAST">
+      <signal name="CanActivateAccel" cname="can_activate_accel" when="LAST" field_name="can_activate_accel">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -19513,33 +19513,33 @@
       <property name="Gravity" cname="gravity" type="GdkGravity" readable="true" writeable="true" />
       <property name="TransientFor" cname="transient-for" type="GtkWindow" readable="true" writeable="true" construct="true" />
       <property name="Opacity" cname="opacity" type="gdouble" readable="true" writeable="true" />
-      <signal name="SetFocus" cname="set_focus" when="LAST">
+      <signal name="SetFocus" cname="set_focus" when="LAST" field_name="set_focus">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
           <parameter type="GtkWidget*" name="focus" />
         </parameters>
       </signal>
-      <signal name="FrameEvent" cname="frame_event" when="LAST">
+      <signal name="FrameEvent" cname="frame_event" when="LAST" field_name="frame_event">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
           <parameter type="GdkEvent*" name="event" />
         </parameters>
       </signal>
-      <signal name="ActivateFocus" cname="activate_focus" when="LAST">
+      <signal name="ActivateFocus" cname="activate_focus" when="LAST" field_name="activate_focus">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
-      <signal name="ActivateDefault" cname="activate_default" when="LAST">
+      <signal name="ActivateDefault" cname="activate_default" when="LAST" field_name="activate_default">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
         </parameters>
       </signal>
-      <signal name="KeysChanged" cname="keys_changed" when="FIRST">
+      <signal name="KeysChanged" cname="keys_changed" when="FIRST" field_name="keys_changed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWindow*" name="window" />
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 7e9aa4eca..0368adcc4 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -949,6 +949,7 @@ sub addSignalElem
 	my $method = "";
 	if ($spec =~ /_OFFSET\s*\(\w+,\s*(\w+)\)/) {
 		$method = $1;
+		$sig_elem->setAttribute('field_name', $1);
 	} else {
 		@args = split(/,/, $spec);
 		my $rettype = parseTypeToken ($args[7]);