2004-11-13 Mike Kestner <mkestner@novell.com>

* */*-api.raw : rerun the parser for new vm-age and cleanups.
	* parser/gapi_pp.pl : suppress union types, since we can't generate
	them.  smarter get_type regex. ignore #errors.
	* parser/gapi2xml.pl : generate vm elements for GInterfaces. Deal
	with G_CONST_RETURN in vms. deal with "struct _foo" types in method
	prototypes.

svn path=/trunk/gtk-sharp/; revision=36088

ChangeLog

@@ -1,3 +1,12 @@
+2004-11-13  Mike Kestner  <mkestner@novell.com>
+
+	* */*-api.raw : rerun the parser for new vm-age and cleanups.
+	* parser/gapi_pp.pl : suppress union types, since we can't generate
+	them.  smarter get_type regex. ignore #errors.
+	* parser/gapi2xml.pl : generate vm elements for GInterfaces. Deal
+	with G_CONST_RETURN in vms. deal with "struct _foo" types in method
+	prototypes.
+
 2004-11-13  Mike Kestner  <mkestner@novell.com>
 
 	* sources/gda.patch : fix broken signal defs.

atk/atk-api.raw

@@ -241,6 +241,34 @@
       </parameters>
     </callback>
     <interface name="Action" cname="AtkAction">
+      <virtual_method name="DoAction" cname="do_action">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkAction*" name="action"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetDescription" cname="get_description">
+        <return-type type="const-gchar*"/>
+        <parameters>
+          <parameter type="AtkAction*" name="action"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetKeybinding" cname="get_keybinding">
+        <return-type type="const-gchar*"/>
+        <parameters>
+          <parameter type="AtkAction*" name="action"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetLocalizedName" cname="get_localized_name">
+        <return-type type="const-gchar*"/>
+        <parameters>
+          <parameter type="AtkAction*" name="action"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
       <method name="DoAction" cname="atk_action_do_action">
         <return-type type="gboolean"/>
         <parameters>
@@ -286,6 +314,62 @@
       </method>
     </interface>
     <interface name="Component" cname="AtkComponent">
+      <virtual_method name="AddFocusHandler" cname="add_focus_handler">
+        <return-type type="guint"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+          <parameter type="AtkFocusHandler" name="handler"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RefAccessibleAtPoint" cname="ref_accessible_at_point">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+          <parameter type="AtkCoordType" name="coord_type"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetPosition" cname="get_position">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+          <parameter type="gint*" name="x"/>
+          <parameter type="gint*" name="y"/>
+          <parameter type="AtkCoordType" name="coord_type"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GrabFocus" cname="grab_focus">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetExtents" cname="set_extents">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+          <parameter type="gint" name="width"/>
+          <parameter type="gint" name="height"/>
+          <parameter type="AtkCoordType" name="coord_type"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetSize" cname="set_size">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+          <parameter type="gint" name="width"/>
+          <parameter type="gint" name="height"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetMdiZorder" cname="get_mdi_zorder">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkComponent*" name="component"/>
+        </parameters>
+      </virtual_method>
       <method name="AddFocusHandler" cname="atk_component_add_focus_handler">
         <return-type type="guint"/>
         <parameters>
@@ -389,6 +473,39 @@
       </method>
     </interface>
     <interface name="EditableText" cname="AtkEditableText">
+      <virtual_method name="SetRunAttributes" cname="set_run_attributes">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkEditableText*" name="text"/>
+          <parameter type="AtkAttributeSet*" name="attrib_set"/>
+          <parameter type="gint" name="start_offset"/>
+          <parameter type="gint" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="InsertText" cname="insert_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkEditableText*" name="text"/>
+          <parameter type="const-gchar*" name="string"/>
+          <parameter type="gint" name="length"/>
+          <parameter type="gint*" name="position"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="CutText" cname="cut_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkEditableText*" name="text"/>
+          <parameter type="gint" name="start_pos"/>
+          <parameter type="gint" name="end_pos"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="PasteText" cname="paste_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkEditableText*" name="text"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </virtual_method>
       <method name="CopyText" cname="atk_editable_text_copy_text">
         <return-type type="void"/>
         <parameters>
@@ -450,6 +567,20 @@
           <parameter type="gint" name="link_index"/>
         </parameters>
       </signal>
+      <virtual_method name="GetLink" cname="get_link">
+        <return-type type="AtkHyperlink*"/>
+        <parameters>
+          <parameter type="AtkHypertext*" name="hypertext"/>
+          <parameter type="gint" name="link_index"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetLinkIndex" cname="get_link_index">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkHypertext*" name="hypertext"/>
+          <parameter type="gint" name="char_index"/>
+        </parameters>
+      </virtual_method>
       <method name="GetLink" cname="atk_hypertext_get_link">
         <return-type type="AtkHyperlink*"/>
         <parameters>
@@ -499,6 +630,12 @@
       </method>
     </interface>
     <interface name="Implementor" cname="AtkImplementor">
+      <virtual_method name="RefAccessible" cname="ref_accessible">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkImplementor*" name="implementor"/>
+        </parameters>
+      </virtual_method>
       <method name="GetType" cname="atk_implementor_get_type" shared="true">
         <return-type type="GType"/>
       </method>
@@ -513,6 +650,33 @@
           <parameter type="AtkSelection*" name="selection"/>
         </parameters>
       </signal>
+      <virtual_method name="AddSelection" cname="add_selection">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkSelection*" name="selection"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RefSelection" cname="ref_selection">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkSelection*" name="selection"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IsChildSelected" cname="is_child_selected">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkSelection*" name="selection"/>
+          <parameter type="gint" name="i"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SelectAllSelection" cname="select_all_selection">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkSelection*" name="selection"/>
+        </parameters>
+      </virtual_method>
       <method name="AddSelection" cname="atk_selection_add_selection">
         <return-type type="gboolean"/>
         <parameters>
@@ -551,6 +715,19 @@
       </method>
     </interface>
     <interface name="StreamableContent" cname="AtkStreamableContent">
+      <virtual_method name="GetNMimeTypes" cname="get_n_mime_types">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkStreamableContent*" name="streamable"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetStream" cname="get_stream">
+        <return-type type="GIOChannel*"/>
+        <parameters>
+          <parameter type="AtkStreamableContent*" name="streamable"/>
+          <parameter type="const-gchar*" name="mime_type"/>
+        </parameters>
+      </virtual_method>
       <method name="GetMimeType" cname="atk_streamable_content_get_mime_type">
         <return-type type="const-gchar*"/>
         <parameters>
@@ -621,6 +798,114 @@
           <parameter type="AtkTable*" name="table"/>
         </parameters>
       </signal>
+      <virtual_method name="RefAt" cname="ref_at">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetColumnAtIndex" cname="get_column_at_index">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="index_"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetNColumns" cname="get_n_columns">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetColumnExtentAt" cname="get_column_extent_at">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetCaption" cname="get_caption">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetColumnHeader" cname="get_column_header">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetRowHeader" cname="get_row_header">
+        <return-type type="AtkObject*"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetCaption" cname="set_caption">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="AtkObject*" name="caption"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetColumnHeader" cname="set_column_header">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="column"/>
+          <parameter type="AtkObject*" name="header"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetRowHeader" cname="set_row_header">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+          <parameter type="AtkObject*" name="header"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetSelectedColumns" cname="get_selected_columns">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint**" name="selected"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IsColumnSelected" cname="is_column_selected">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IsSelected" cname="is_selected">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RemoveRowSelection" cname="remove_row_selection">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="row"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RemoveColumnSelection" cname="remove_column_selection">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkTable*" name="table"/>
+          <parameter type="gint" name="column"/>
+        </parameters>
+      </virtual_method>
       <method name="AddColumnSelection" cname="atk_table_add_column_selection">
         <return-type type="gboolean"/>
         <parameters>
@@ -824,6 +1109,97 @@
           <parameter type="AtkText*" name="text"/>
         </parameters>
       </signal>
+      <virtual_method name="GetText" cname="get_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="start_offset"/>
+          <parameter type="gint" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetTextAtOffset" cname="get_text_at_offset">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="offset"/>
+          <parameter type="AtkTextBoundary" name="boundary_type"/>
+          <parameter type="gint*" name="start_offset"/>
+          <parameter type="gint*" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetTextBeforeOffset" cname="get_text_before_offset">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="offset"/>
+          <parameter type="AtkTextBoundary" name="boundary_type"/>
+          <parameter type="gint*" name="start_offset"/>
+          <parameter type="gint*" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetRunAttributes" cname="get_run_attributes">
+        <return-type type="AtkAttributeSet*"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="offset"/>
+          <parameter type="gint*" name="start_offset"/>
+          <parameter type="gint*" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetCharacterExtents" cname="get_character_extents">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="offset"/>
+          <parameter type="gint*" name="x"/>
+          <parameter type="gint*" name="y"/>
+          <parameter type="gint*" name="width"/>
+          <parameter type="gint*" name="height"/>
+          <parameter type="AtkCoordType" name="coords"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetOffsetAtPoint" cname="get_offset_at_point">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+          <parameter type="AtkCoordType" name="coords"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetSelection" cname="get_selection">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="selection_num"/>
+          <parameter type="gint*" name="start_offset"/>
+          <parameter type="gint*" name="end_offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RemoveSelection" cname="remove_selection">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="selection_num"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetCaretOffset" cname="set_caret_offset">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="gint" name="offset"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetBoundedRanges" cname="get_bounded_ranges">
+        <return-type type="AtkTextRange**"/>
+        <parameters>
+          <parameter type="AtkText*" name="text"/>
+          <parameter type="AtkTextRectangle*" name="rect"/>
+          <parameter type="AtkCoordType" name="coord_type"/>
+          <parameter type="AtkTextClipType" name="x_clip_type"/>
+          <parameter type="AtkTextClipType" name="y_clip_type"/>
+        </parameters>
+      </virtual_method>
       <method name="AddSelection" cname="atk_text_add_selection">
         <return-type type="gboolean"/>
         <parameters>
@@ -992,6 +1368,20 @@
       </method>
     </interface>
     <interface name="Value" cname="AtkValue">
+      <virtual_method name="GetCurrentValue" cname="get_current_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkValue*" name="obj"/>
+          <parameter type="GValue*" name="value"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetMinimumValue" cname="get_minimum_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="AtkValue*" name="obj"/>
+          <parameter type="GValue*" name="value"/>
+        </parameters>
+      </virtual_method>
       <method name="GetCurrentValue" cname="atk_value_get_current_value">
         <return-type type="void"/>
         <parameters>
@@ -1199,6 +1589,12 @@
           <parameter type="gpointer*" name="child"/>
         </parameters>
       </signal>
+      <virtual_method name="GetName" cname="get_name">
+        <return-type type="const-gchar*"/>
+        <parameters>
+          <parameter type="AtkObject*" name="accessible"/>
+        </parameters>
+      </virtual_method>
       <virtual_method name="GetParent" cname="get_parent">
         <return-type type="AtkObject*"/>
         <parameters>
@@ -1565,6 +1961,9 @@
       <virtual_method name="GetRoot" cname="get_root">
         <return-type type="AtkObject*"/>
       </virtual_method>
+      <virtual_method name="GetToolkitVersion" cname="get_toolkit_version">
+        <return-type type="const-gchar*"/>
+      </virtual_method>
       <method name="GetType" cname="atk_util_get_type" shared="true">
         <return-type type="GType"/>
       </method>

gda/gda-api.raw

@@ -138,15 +138,6 @@
           <parameter type="GdaParameterList*" name="params"/>
         </parameters>
       </signal>
-      <virtual_method name="EventNotification" cname="event_notification">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaClient*" name="client"/>
-          <parameter type="GdaConnection*" name="cnc"/>
-          <parameter type="GdaClientEvent" name="event"/>
-          <parameter type="GdaParameterList*" name="params"/>
-        </parameters>
-      </virtual_method>
       <method name="BeginTransaction" cname="gda_client_begin_transaction">
         <return-type type="gboolean"/>
         <parameters>
@@ -252,13 +243,6 @@
           <parameter type="GList*" name="error_list"/>
         </parameters>
       </signal>
-      <virtual_method name="Error" cname="error">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaConnection*" name="cnc"/>
-          <parameter type="GList*" name="error_list"/>
-        </parameters>
-      </virtual_method>
       <method name="AddError" cname="gda_connection_add_error">
         <return-type type="void"/>
         <parameters>
@@ -457,37 +441,19 @@
           <parameter type="GdaDataModel*" name="model"/>
         </parameters>
       </signal>
-      <virtual_method name="Changed" cname="changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaDataModel*" name="model"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="RowUpdated" cname="row_updated">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaDataModel*" name="model"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="BeginEdit" cname="begin_edit">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaDataModel*" name="model"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="EndEdit" cname="end_edit">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaDataModel*" name="model"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="GetNColumns" cname="get_n_columns">
+      <virtual_method name="GetNRows" cname="get_n_rows">
         <return-type type="gint"/>
         <parameters>
           <parameter type="GdaDataModel*" name="model"/>
         </parameters>
       </virtual_method>
+      <virtual_method name="DescribeColumn" cname="describe_column">
+        <return-type type="GdaFieldAttributes*"/>
+        <parameters>
+          <parameter type="GdaDataModel*" name="model"/>
+          <parameter type="gint" name="col"/>
+        </parameters>
+      </virtual_method>
       <virtual_method name="IsEditable" cname="is_editable">
         <return-type type="gboolean"/>
         <parameters>
@@ -814,11 +780,10 @@
           <parameter type="const-gchar*" name="name"/>
         </parameters>
       </signal>
-      <signal name="Finished" cname="finished" when="LAST">
+      <signal name="Cancelled" cname="cancelled" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GdaExport*" name="exp"/>
-          <parameter type="GdaXmlDatabase*" name="xmldb"/>
         </parameters>
       </signal>
       <signal name="Finished" cname="finished" when="LAST">
@@ -828,21 +793,6 @@
           <parameter type="GdaXmlDatabase*" name="xmldb"/>
         </parameters>
       </signal>
-      <virtual_method name="ObjectSelected" cname="object_selected">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaExport*" name="exp"/>
-          <parameter type="GdaConnectionSchema" name="schema"/>
-          <parameter type="const-gchar*" name="name"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="Finished" cname="finished">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaExport*" name="exp"/>
-          <parameter type="GdaXmlDatabase*" name="xmldb"/>
-        </parameters>
-      </virtual_method>
       <method name="GetConnection" cname="gda_export_get_connection">
         <return-type type="GdaConnection*"/>
       </method>
@@ -1214,12 +1164,6 @@
           <parameter type="GdaXmlDatabase*" name="xmldb"/>
         </parameters>
       </signal>
-      <virtual_method name="Changed" cname="changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXmlDatabase*" name="xmldb"/>
-        </parameters>
-      </virtual_method>
       <method name="Changed" cname="gda_xml_database_changed">
         <return-type type="void"/>
       </method>
@@ -1329,13 +1273,6 @@
           <parameter type="const-char*" name="msg"/>
         </parameters>
       </signal>
-      <virtual_method name="Warning" cname="warning">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXmlDocument*" name="q"/>
-          <parameter type="const-char*" name="msg"/>
-        </parameters>
-      </virtual_method>
       <method name="Construct" cname="gda_xml_document_construct">
         <return-type type="void"/>
         <parameters>

gdk/gdk-api.raw

@@ -664,16 +664,17 @@
           <parameter type="gboolean" name="is_error"/>
         </parameters>
       </signal>
-      <virtual_method name="GetNScreens" cname="get_n_screens">
-        <return-type type="gint"/>
+      <virtual_method name="GetDisplayName" cname="get_display_name">
+        <return-type type="const-gchar*"/>
         <parameters>
           <parameter type="GdkDisplay*" name="display"/>
         </parameters>
       </virtual_method>
-      <virtual_method name="GetDefaultScreen" cname="get_default_screen">
+      <virtual_method name="GetScreen" cname="get_screen">
         <return-type type="GdkScreen*"/>
         <parameters>
           <parameter type="GdkDisplay*" name="display"/>
+          <parameter type="gint" name="screen_num"/>
         </parameters>
       </virtual_method>
       <method name="AddClientMessageFilter" cname="gdk_display_add_client_message_filter">

gnomedb/gnomedb-api.raw

@@ -35,13 +35,6 @@
           <parameter type="const-gchar*" name="msg"/>
         </parameters>
       </signal>
-      <virtual_method name="ProgressMessage" cname="progress_message">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbBrowser*" name="browser"/>
-          <parameter type="const-gchar*" name="msg"/>
-        </parameters>
-      </virtual_method>
       <method name="GetConnection" cname="gnome_db_browser_get_connection">
         <return-type type="GdaConnection*"/>
       </method>
@@ -125,20 +118,6 @@
           <parameter type="guint" name="id"/>
         </parameters>
       </signal>
-      <virtual_method name="Activated" cname="activated">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbControl*" name="control"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="SetProperty" cname="set_property">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbControl*" name="control"/>
-          <parameter type="const-GdaValue*" name="value"/>
-          <parameter type="guint" name="id"/>
-        </parameters>
-      </virtual_method>
       <method name="Activate" cname="gnome_db_control_activate">
         <return-type type="void"/>
       </method>
@@ -237,12 +216,6 @@
           <parameter type="GnomeDbDsnConfig*" name="config"/>
         </parameters>
       </signal>
-      <virtual_method name="Changed" cname="changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbDsnConfig*" name="config"/>
-        </parameters>
-      </virtual_method>
       <method name="GetInfo" cname="gnome_db_dsn_config_get_info">
         <return-type type="GdaDataSourceInfo*"/>
       </method>
@@ -266,13 +239,6 @@
           <parameter type="gboolean" name="error"/>
         </parameters>
       </signal>
-      <virtual_method name="Finished" cname="finished">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbDsnConfigDruid*" name="druid"/>
-          <parameter type="gboolean" name="error"/>
-        </parameters>
-      </virtual_method>
       <method name="GetDsn" cname="gnome_db_dsn_config_druid_get_dsn">
         <return-type type="const-GdaDataSourceInfo*"/>
       </method>
@@ -397,12 +363,6 @@
           <parameter type="GnomeDbForm*" name="form"/>
         </parameters>
       </signal>
-      <virtual_method name="ModelChanged" cname="model_changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbForm*" name="form"/>
-        </parameters>
-      </virtual_method>
       <method name="GetCurrentRow" cname="gnome_db_form_get_current_row">
         <return-type type="gint"/>
       </method>
@@ -509,20 +469,6 @@
           <parameter type="GtkWidget*" name="menu"/>
         </parameters>
       </signal>
-      <virtual_method name="RowSelected" cname="row_selected">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbGrid*" name="grid"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </virtual_method>
-      <virtual_method name="DoubleClicked" cname="double_clicked">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbGrid*" name="grid"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </virtual_method>
       <method name="FindRowFromData" cname="gnome_db_grid_find_row_from_data">
         <return-type type="gint"/>
         <parameters>
@@ -664,16 +610,8 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GnomeDbList*" name="list"/>
-          <parameter type="gint" name="row"/>
         </parameters>
       </signal>
-      <virtual_method name="RowSelected" cname="row_selected">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbList*" name="list"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </virtual_method>
       <method name="GetModel" cname="gnome_db_list_get_model">
         <return-type type="GdaDataModel*"/>
       </method>
@@ -822,12 +760,6 @@
           <parameter type="GnomeDbWindow*" name="window"/>
         </parameters>
       </signal>
-      <virtual_method name="Close" cname="close">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbWindow*" name="window"/>
-        </parameters>
-      </virtual_method>
       <method name="Close" cname="gnome_db_window_close">
         <return-type type="void"/>
       </method>

gtk/gtk-api.raw

@@ -1054,6 +1054,13 @@
           <parameter type="GtkCellEditable*" name="cell_editable"/>
         </parameters>
       </signal>
+      <virtual_method name="StartEditing" cname="start_editing">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellEditable*" name="cell_editable"/>
+          <parameter type="GdkEvent*" name="event"/>
+        </parameters>
+      </virtual_method>
       <method name="EditingDone" cname="gtk_cell_editable_editing_done">
         <return-type type="void"/>
       </method>
@@ -1071,6 +1078,38 @@
       </method>
     </interface>
     <interface name="CellLayout" cname="GtkCellLayout">
+      <virtual_method name="PackStart" cname="pack_start">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellLayout*" name="cell_layout"/>
+          <parameter type="GtkCellRenderer*" name="cell"/>
+          <parameter type="gboolean" name="expand"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="Clear" cname="clear">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellLayout*" name="cell_layout"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetCellDataFunc" cname="set_cell_data_func">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellLayout*" name="cell_layout"/>
+          <parameter type="GtkCellRenderer*" name="cell"/>
+          <parameter type="GtkCellLayoutDataFunc" name="func"/>
+          <parameter type="gpointer" name="func_data"/>
+          <parameter type="GDestroyNotify" name="destroy"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="Reorder" cname="reorder">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellLayout*" name="cell_layout"/>
+          <parameter type="GtkCellRenderer*" name="cell"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </virtual_method>
       <method name="AddAttribute" cname="gtk_cell_layout_add_attribute">
         <return-type type="void"/>
         <parameters>
@@ -1153,6 +1192,37 @@
           <parameter type="GtkEditable*" name="editable"/>
         </parameters>
       </signal>
+      <virtual_method name="DoInsertText" cname="do_insert_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkEditable*" name="editable"/>
+          <parameter type="const-gchar*" name="text"/>
+          <parameter type="gint" name="length"/>
+          <parameter type="gint*" name="position"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetChars" cname="get_chars">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="GtkEditable*" name="editable"/>
+          <parameter type="gint" name="start_pos"/>
+          <parameter type="gint" name="end_pos"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetSelectionBounds" cname="get_selection_bounds">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkEditable*" name="editable"/>
+          <parameter type="gint*" name="start_pos"/>
+          <parameter type="gint*" name="end_pos"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetPosition" cname="get_position">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="GtkEditable*" name="editable"/>
+        </parameters>
+      </virtual_method>
       <method name="CopyClipboard" cname="gtk_editable_copy_clipboard">
         <return-type type="void"/>
       </method>
@@ -1248,6 +1318,61 @@
           <parameter type="GtkFileChooser*" name="chooser"/>
         </parameters>
       </signal>
+      <virtual_method name="SetCurrentFolder" cname="set_current_folder">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetCurrentName" cname="set_current_name">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+          <parameter type="const-gchar*" name="name"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="UnselectPath" cname="unselect_path">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="UnselectAll" cname="unselect_all">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetPreviewPath" cname="get_preview_path">
+        <return-type type="GtkFilePath*"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddFilter" cname="add_filter">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+          <parameter type="GtkFileFilter*" name="filter"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="ListFilters" cname="list_filters">
+        <return-type type="GSList*"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RemoveShortcutFolder" cname="remove_shortcut_folder">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileChooser*" name="chooser"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
       <method name="AddFilter" cname="gtk_file_chooser_add_filter">
         <return-type type="void"/>
         <parameters>
@@ -1467,6 +1592,20 @@
           <parameter type="GtkFileChooserEmbed*" name="chooser_embed"/>
         </parameters>
       </signal>
+      <virtual_method name="GetDefaultSize" cname="get_default_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileChooserEmbed*" name="chooser_embed"/>
+          <parameter type="gint*" name="default_width"/>
+          <parameter type="gint*" name="default_height"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="ShouldRespond" cname="should_respond">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileChooserEmbed*" name="chooser_embed"/>
+        </parameters>
+      </virtual_method>
     </interface>
     <interface name="FileFolder" cname="GtkFileFolder">
       <signal name="Deleted" cname="deleted" when="LAST">
@@ -1502,6 +1641,20 @@
           <parameter type="GtkFileFolder*" name="folder"/>
         </parameters>
       </signal>
+      <virtual_method name="GetInfo" cname="get_info">
+        <return-type type="GtkFileInfo*"/>
+        <parameters>
+          <parameter type="GtkFileFolder*" name="folder"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IsFinishedLoading" cname="is_finished_loading">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileFolder*" name="folder"/>
+        </parameters>
+      </virtual_method>
       <method name="GetInfo" cname="gtk_file_folder_get_info">
         <return-type type="GtkFileInfo*"/>
         <parameters>
@@ -1536,6 +1689,91 @@
           <parameter type="GtkFileSystem*" name="file_system"/>
         </parameters>
       </signal>
+      <virtual_method name="ListVolumes" cname="list_volumes">
+        <return-type type="GSList*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetFolder" cname="get_folder">
+        <return-type type="GtkFileFolder*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="GtkFileInfoType" name="types"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="VolumeFree" cname="volume_free">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="GtkFileSystemVolume*" name="volume"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="VolumeGetIsMounted" cname="volume_get_is_mounted">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="GtkFileSystemVolume*" name="volume"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="VolumeGetDisplayName" cname="volume_get_display_name">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="GtkFileSystemVolume*" name="volume"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetParent" cname="get_parent">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="GtkFilePath**" name="parent"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="Parse" cname="parse">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-GtkFilePath*" name="base_path"/>
+          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkFilePath**" name="folder"/>
+          <parameter type="gchar**" name="file_part"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="PathToFilename" cname="path_to_filename">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="FilenameToPath" cname="filename_to_path">
+        <return-type type="GtkFilePath*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-gchar*" name="path"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="InsertBookmark" cname="insert_bookmark">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+          <parameter type="const-GtkFilePath*" name="path"/>
+          <parameter type="gint" name="position"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="ListBookmarks" cname="list_bookmarks">
+        <return-type type="GSList*"/>
+        <parameters>
+          <parameter type="GtkFileSystem*" name="file_system"/>
+        </parameters>
+      </virtual_method>
       <method name="CreateFolder" cname="gtk_file_system_create_folder">
         <return-type type="gboolean"/>
         <parameters>
@@ -1651,6 +1889,14 @@
       </method>
     </interface>
     <interface name="TreeDragDest" cname="GtkTreeDragDest">
+      <virtual_method name="DragDataReceived" cname="drag_data_received">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeDragDest*" name="drag_dest"/>
+          <parameter type="GtkTreePath*" name="dest"/>
+          <parameter type="GtkSelectionData*" name="selection_data"/>
+        </parameters>
+      </virtual_method>
       <method name="DragDataReceived" cname="gtk_tree_drag_dest_drag_data_received">
         <return-type type="gboolean"/>
         <parameters>
@@ -1670,6 +1916,20 @@
       </method>
     </interface>
     <interface name="TreeDragSource" cname="GtkTreeDragSource">
+      <virtual_method name="RowDraggable" cname="row_draggable">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeDragSource*" name="drag_source"/>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="DragDataDelete" cname="drag_data_delete">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeDragSource*" name="drag_source"/>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </virtual_method>
       <method name="DragDataDelete" cname="gtk_tree_drag_source_drag_data_delete">
         <return-type type="gboolean"/>
         <parameters>
@@ -1734,6 +1994,56 @@
           <parameter type="gint*" name="new_order"/>
         </parameters>
       </signal>
+      <virtual_method name="GetFlags" cname="get_flags">
+        <return-type type="GtkTreeModelFlags"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetColumnType" cname="get_column_type">
+        <return-type type="GType"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="gint" name="index_"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="GetPath" cname="get_path">
+        <return-type type="GtkTreePath*"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IterNext" cname="iter_next">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IterHasChild" cname="iter_has_child">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="IterNthChild" cname="iter_nth_child">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="parent"/>
+          <parameter type="gint" name="n"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="RefNode" cname="ref_node">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </virtual_method>
       <method name="Foreach" cname="gtk_tree_model_foreach">
         <return-type type="void"/>
         <parameters>
@@ -1905,6 +2215,30 @@
           <parameter type="GtkTreeSortable*" name="sortable"/>
         </parameters>
       </signal>
+      <virtual_method name="GetSortColumnId" cname="get_sort_column_id">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeSortable*" name="sortable"/>
+          <parameter type="gint*" name="sort_column_id"/>
+          <parameter type="GtkSortType*" name="order"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="SetSortFunc" cname="set_sort_func">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeSortable*" name="sortable"/>
+          <parameter type="gint" name="sort_column_id"/>
+          <parameter type="GtkTreeIterCompareFunc" name="func"/>
+          <parameter type="gpointer" name="data"/>
+          <parameter type="GtkDestroyNotify" name="destroy"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="HasDefaultSortFunc" cname="has_default_sort_func">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeSortable*" name="sortable"/>
+        </parameters>
+      </virtual_method>
       <method name="GetSortColumnId" cname="gtk_tree_sortable_get_sort_column_id">
         <return-type type="gboolean"/>
         <parameters>

pango/pango-api.raw

@@ -1354,10 +1354,6 @@
       <field cname="width" type="int"/>
       <field cname="height" type="int"/>
     </struct>
-    <struct name="ScriptForLang" cname="PangoScriptForLang">
-      <field cname="lang" array_len="6" type="const-char"/>
-      <field cname="scripts" array_len="3" type="PangoScript"/>
-    </struct>
     <struct name="ScriptIter" cname="PangoScriptIter" opaque="true">
       <method name="Free" cname="pango_script_iter_free">
         <return-type type="void"/>

parser/gapi2xml.pl

@@ -149,8 +149,8 @@ while ($line = <STDIN>) {
 			last if ($line =~ /^}/);
 		}
 		$typefuncs{lc($class)} = $pedef;
-	} elsif ($line =~ /^(deprecated)?(const|G_CONST_RETURN)?\s*\w+\s*\**\s*(\w+)\s*\(/) {
-		$fname = $3;
+	} elsif ($line =~ /^(deprecated)?(const|G_CONST_RETURN)?\s*(struct\s+)?\w+\s*\**\s*(\w+)\s*\(/) {
+		$fname = $4;
 		$fdef = "";
 		while ($line !~ /;/) {
 			$fdef .= $line;
@@ -295,9 +295,10 @@ foreach $type (sort(keys(%ifaces))) {
 
 	$classdef = $sdefs{$1} if ($ifacetype =~ /struct\s+(\w+)/);
 	if ($initfunc) {
-		parseInitFunc($iface_el, $initfunc, 0);
+		parseInitFunc($iface_el, $initfunc);
 	} else {
 		warn "Don't have an init func for $inst.\n" if $debug;
+		addVirtualMethods ($classdef, $iface_el);
 	}
 }
 
@@ -350,7 +351,7 @@ foreach $type (sort(keys(%objects))) {
 
 	# Get the props from the class_init func.
 	if ($initfunc) {
-		parseInitFunc($obj_el, $initfunc, 1);
+		parseInitFunc($obj_el, $initfunc);
 	} else {
 		warn "Don't have an init func for $inst.\n" if $debug;
 	}
@@ -889,13 +890,13 @@ sub addSignalElem
 		return $class;
 	}
 
-	if ($class =~ /;\s*(G_CONST_RETURN)?\s*(\S+\s*\**)\s*\(\*\s*$method\)\s*\((.*?)\);/) {
+	if ($class =~ /;\s*(G_CONST_RETURN\s+)?(\w+\s*\**)\s*\(\*\s*$method\)\s*\((.*?)\);/) {
 		$ret = $2; $parms = $3;
 		addReturnElem($sig_elem, $ret);
 		if ($parms && ($parms ne "void")) {
 			addParamsElem($sig_elem, split(/,/, $parms));
 		}
-		$class =~ s/;\s*(G_CONST_RETURN)?\s*\S+\s*\**\s*\(\*\s*$method\)\s*\(.*?\);/;/;
+		$class =~ s/;\s*(G_CONST_RETURN\s+)?\w+\s*\**\s*\(\*\s*$method\)\s*\(.*?\);/;/;
 	} else {
 		die "$method $class";
 	}
@@ -908,8 +909,8 @@ sub addVirtualMethods
 	my ($class, $node) = @_;
 	$class =~ s/\n\s*//g;
 
-	while ($class =~ /;\s*(\S+\s*\**)\s*\(\*\s*(\w+)\)\s*\((.*?)\);/) {
-		$ret = $1; $cname = $2; $parms = $3;
+	while ($class =~ /;\s*(G_CONST_RETURN\s+)?(\S+\s*\**)\s*\(\*\s*(\w+)\)\s*\((.*?)\);/) {
+		$ret = $1 . $2; $cname = $3; $parms = $4;
 		if ($cname !~ /reserved/) {
 			$vm_elem = $doc->createElement('virtual_method');
 			$node->appendChild($vm_elem);
@@ -920,7 +921,7 @@ sub addVirtualMethods
 				addParamsElem($vm_elem, split(/,/, $parms));
 			}
 		}
-		$class =~ s/;\s*\S+\s*\**\s*\(\*\s*\w+\)\s*\(.*?\);//;
+		$class =~ s/;\s*(G_CONST_RETURN\s+)?\S+\s*\**\s*\(\*\s*\w+\)\s*\(.*?\);//;
 	}
 }
 
@@ -939,7 +940,7 @@ sub addImplementsElem
 
 sub parseInitFunc
 {
-	my ($obj_el, $initfunc, $is_obj) = @_;
+	my ($obj_el, $initfunc) = @_;
 
 	my @init_lines = split (/\n/, $initfunc);
 
@@ -975,9 +976,7 @@ sub parseInitFunc
 		$linenum++;
 	}
 
-	if ($is_obj) {
-		addVirtualMethods ($classdef, $obj_el);
-	}
+	addVirtualMethods ($classdef, $obj_el);
 }
 
 sub parseTypeFunc

parser/gapi_pp.pl

@@ -26,7 +26,7 @@
 
 $private_regex = "^#if.*(ENABLE_BACKEND|ENABLE_ENGINE)";
 $eatit_regex = "^#if.*(__cplusplus|DEBUG|DISABLE_COMPAT|ENABLE_BROKEN)";
-$ignoreit_regex = '^\s+\*|#ident|#\s*include|#\s*else|#\s*undef|G_(BEGIN|END)_DECLS|GDKVAR|GTKVAR|GTKMAIN_C_VAR|GTKTYPEUTILS_VAR|VARIABLE|GTKTYPEBUILTIN';
+$ignoreit_regex = '^\s+\*|#ident|#error|#\s*include|#\s*else|#\s*undef|G_(BEGIN|END)_DECLS|GDKVAR|GTKVAR|GTKMAIN_C_VAR|GTKTYPEUTILS_VAR|VARIABLE|GTKTYPEBUILTIN';
 
 foreach $arg (@ARGV) {
 	if (-d $arg && -e $arg) {
@@ -144,6 +144,9 @@ foreach $fname (@hdrs) {
 			print "};\n";
 		} elsif ($line =~ /^enum\s+\{/) {
 			while ($line !~ /^};/) {$line = <INFILE>;}
+		} elsif ($line =~ /^(typedef\s+)?union/) {
+			next if ($line =~ /^typedef\s+union\s+\w+\s+\w+;/);
+			while ($line !~ /^};/) {$line = <INFILE>;}
 		} elsif ($line =~ /(\s+)union\s*{/) {
 			# this is a hack for now, but I need it for the fields to work
 			$indent = $1;
@@ -186,7 +189,7 @@ foreach $fname (@srcs, @privhdrs) {
 	}
 
 	while ($line = <INFILE>) {
-		next if ($line !~ /^(struct|\w+_class_init|\w+_base_init|\w+_get_type)/);
+		next if ($line !~ /^(struct|\w+_class_init|\w+_base_init|\w+_get_type\b)/);
 
 		if ($line =~ /^struct/) {
 			# need some of these to parse out parent types