diff --git a/ChangeLog b/ChangeLog
index 8089c50e8..6bffe1abd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-14  Mike Kestner  <mkestner@speakeasy.net>
+
+	* parser/gapi2xml.pl : some whitespace parsing cleanup
+	* api/*-api.xml : rerun of the parser.
+
 2003-06-12  Mike Kestner  <mkestner@speakeasy.net>
 
 	* generator/SimpleGen.cs : mark a few members virtual 
diff --git a/api/art-api.xml b/api/art-api.xml
index 339b1803a..dd4c6df5f 100644
--- a/api/art-api.xml
+++ b/api/art-api.xml
@@ -300,7 +300,7 @@
         </parameters>
       </constructor>
     </struct>
-    <alias name="PixMaxDepth" cname="ArtPixMaxDepth" type="art_u8 "/>
+    <alias name="PixMaxDepth" cname="ArtPixMaxDepth" type="art_u8"/>
     <struct name="Point" cname="ArtPoint">
       <field cname="x" type="double"/>
       <field cname="y" type="double"/>
@@ -687,7 +687,7 @@
         </parameters>
       </method>
     </struct>
-    <alias name="UtaBbox" cname="ArtUtaBbox" type="art_u32 "/>
+    <alias name="UtaBbox" cname="ArtUtaBbox" type="art_u32"/>
     <struct name="Vpath" cname="ArtVpath">
       <field cname="code" type="ArtPathcode"/>
       <field cname="x" type="double"/>
@@ -748,6 +748,6 @@
       <field cname="n_dash" type="int"/>
       <field cname="dash" type="double*"/>
     </struct>
-    <alias name="ArtBoolean" cname="art_boolean" type="int "/>
+    <alias name="ArtBoolean" cname="art_boolean" type="int"/>
   </namespace>
 </api>
diff --git a/api/atk-api.xml b/api/atk-api.xml
index fa187ed29..12cccf190 100644
--- a/api/atk-api.xml
+++ b/api/atk-api.xml
@@ -1324,7 +1324,7 @@
         </parameters>
       </method>
     </struct>
-    <alias name="AttributeSet" cname="AtkAttributeSet" type="GSList "/>
+    <alias name="AttributeSet" cname="AtkAttributeSet" type="GSList"/>
     <struct name="KeyEventStruct" cname="AtkKeyEventStruct">
       <field cname="type" type="gint"/>
       <field cname="state" type="guint"/>
@@ -1339,6 +1339,6 @@
       <field cname="old_value" type="GValue"/>
       <field cname="new_value" type="GValue"/>
     </struct>
-    <alias name="State" cname="AtkState" type="guint64      "/>
+    <alias name="State" cname="AtkState" type="guint64"/>
   </namespace>
 </api>
diff --git a/api/gda-api.xml b/api/gda-api.xml
index 50ca7b600..f78e570c1 100644
--- a/api/gda-api.xml
+++ b/api/gda-api.xml
@@ -115,87 +115,6 @@
         <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
-    <object name="Batch" cname="GdaBatch" parent="GObject" hidden="1">
-      <field cname="cnc" type="GdaConnection*"/>
-      <field cname="transaction_mode" type="gboolean"/>
-      <field cname="is_running" type="gboolean"/>
-      <field cname="commands" type="GList*"/>
-      <signal name="BeginTransaction" cname="begin_transaction" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaBatch*" name="job"/>
-        </parameters>
-      </signal>
-      <signal name="CommitTransaction" cname="commit_transaction" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaBatch*" name="job"/>
-        </parameters>
-      </signal>
-      <signal name="RollbackTransaction" cname="rollback_transaction" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaBatch*" name="job"/>
-        </parameters>
-      </signal>
-      <signal name="ExecuteCommand" cname="execute_command" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaBatch*" name="job"/>
-          <parameter type="const-gchar*" name="cmd"/>
-        </parameters>
-      </signal>
-      <method name="AddCommand" cname="gda_batch_add_command">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="cmd"/>
-        </parameters>
-      </method>
-      <method name="Clear" cname="gda_batch_clear">
-        <return-type type="void"/>
-      </method>
-      <method name="Free" cname="gda_batch_free">
-        <return-type type="void"/>
-      </method>
-      <method name="GetConnection" cname="gda_batch_get_connection">
-        <return-type type="GdaConnection*"/>
-      </method>
-      <method name="GetTransactionMode" cname="gda_batch_get_transaction_mode">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetType" cname="gda_batch_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <method name="IsRunning" cname="gda_batch_is_running">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="LoadFile" cname="gda_batch_load_file">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-gchar*" name="filename"/>
-          <parameter type="gboolean" name="clean"/>
-        </parameters>
-      </method>
-      <constructor cname="gda_batch_new"/>
-      <method name="SetConnection" cname="gda_batch_set_connection">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaConnection*" name="cnc"/>
-        </parameters>
-      </method>
-      <method name="SetTransactionMode" cname="gda_batch_set_transaction_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="mode"/>
-        </parameters>
-      </method>
-      <method name="Start" cname="gda_batch_start">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Stop" cname="gda_batch_stop">
-        <return-type type="void"/>
-      </method>
-    </object>
     <object name="Client" cname="GdaClient" parent="GObject">
       <field cname="priv" type="GdaClientPrivate*"/>
       <signal name="EventNotification" cname="event_notification" when="LAST">
@@ -1985,7 +1904,7 @@
         <return-type type="xmlNodePtr"/>
       </method>
     </struct>
-    <alias name="ValueList" cname="GdaValueList" type="GList "/>
+    <alias name="ValueList" cname="GdaValueList" type="GList"/>
     <struct name="XqlAtom" cname="GdaXqlAtom">
       <field cname="xqlitem" type="GdaXqlItem"/>
       <method name="GetType" cname="gda_xql_atom_get_type" shared="true">
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index baaaf8433..c6ac693d3 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -1502,8 +1502,8 @@
           <callback cname="child_func">
             <return-type type="gboolean"/>
             <parameters>
-              <parameter type="" name=""/>
-              <parameter type="" name=""/>
+              <parameter type=" &#9;&#9;&#9;&#9;&#9;&#9; gboolean " name="child_func"/>
+              <parameter type=" &#9;&#9;&#9;&#9;&#9;&#9; gboolean " name="child_func"/>
             </parameters>
           </callback>
           <parameter type="gpointer" name="user_data"/>
@@ -2078,7 +2078,7 @@
       <field cname="group" type="gint"/>
       <field cname="level" type="gint"/>
     </struct>
-    <alias name="NativeWindow" cname="GdkNativeWindow" type="guint32 "/>
+    <alias name="NativeWindow" cname="GdkNativeWindow" type="guint32"/>
     <struct name="PangoAttrEmbossed" cname="GdkPangoAttrEmbossed">
       <field cname="attr" type="PangoAttribute"/>
       <field cname="embossed" type="gboolean"/>
@@ -2254,7 +2254,12 @@
         </parameters>
       </method>
     </struct>
-    <alias name="RegionBox" cname="GdkRegionBox" type="GdkSegment "/>
+    <struct name="RegionBox" cname="GdkRegionBox">
+      <field cname="x1" type="gint"/>
+      <field cname="y1" type="gint"/>
+      <field cname="x2" type="gint"/>
+      <field cname="y2" type="gint"/>
+    </struct>
     <struct name="RgbCmap" cname="GdkRgbCmap">
       <field cname="colors" array_len="256" type="guint32"/>
       <field cname="n_colors" type="gint"/>
@@ -2298,7 +2303,7 @@
       <field cname="time" type="guint32"/>
       <field cname="axes" array_len="GDK_MAX_TIMECOORD_AXES" type="gdouble"/>
     </struct>
-    <alias name="WChar" cname="GdkWChar" type="guint32       "/>
+    <alias name="WChar" cname="GdkWChar" type="guint32"/>
     <struct name="WindowAttr" cname="GdkWindowAttr">
       <field cname="title" type="gchar*"/>
       <field cname="event_mask" type="gint"/>
@@ -2315,7 +2320,7 @@
       <field cname="wmclass_class" type="gchar*"/>
       <field cname="override_redirect" type="gboolean"/>
     </struct>
-    <alias name="XEvent" cname="GdkXEvent" type="void "/>
+    <alias name="XEvent" cname="GdkXEvent" type="void"/>
     <struct name="Atom" cname="GdkAtom" opaque="true">
       <method name="Intern" cname="gdk_atom_intern" shared="true">
         <return-type type="GdkAtom"/>
diff --git a/api/gst-api.xml b/api/gst-api.xml
index 2ab68a902..04cb40a3c 100644
--- a/api/gst-api.xml
+++ b/api/gst-api.xml
@@ -2531,9 +2531,9 @@
         <return-type type="GstCaps*"/>
       </method>
     </struct>
-    <alias name="ClockID" cname="GstClockID" type="gpointer  "/>
-    <alias name="ClockTime" cname="GstClockTime" type="guint64  "/>
-    <alias name="ClockTimeDiff" cname="GstClockTimeDiff" type="gint64   "/>
+    <alias name="ClockID" cname="GstClockID" type="gpointer"/>
+    <alias name="ClockTime" cname="GstClockTime" type="guint64"/>
+    <alias name="ClockTimeDiff" cname="GstClockTimeDiff" type="gint64"/>
     <struct name="Data" cname="GstData">
       <field cname="type" type="GType"/>
       <field cname="refcount" type="GstAtomicInt"/>
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 32e420565..858d976da 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -10253,7 +10253,7 @@
       <field cname="accel_mods" type="GdkModifierType"/>
       <field cname="accel_flags" bits="16" type="guint"/>
     </struct>
-    <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle    "/>
+    <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle"/>
     <struct name="Arg" cname="GtkArg" opaque="true">
       <method name="FlagsGetType" cname="gtk_arg_flags_get_type" shared="true">
         <return-type type="GType"/>
@@ -11502,7 +11502,7 @@
         <return-type type="gboolean"/>
       </method>
     </struct>
-    <alias name="Type" cname="GtkType" type="GType   "/>
+    <alias name="Type" cname="GtkType" type="GType"/>
     <struct name="WidgetAuxInfo" cname="GtkWidgetAuxInfo" hidden="1">
       <field cname="x" type="gint"/>
       <field cname="y" type="gint"/>
diff --git a/api/pango-api.xml b/api/pango-api.xml
index ce3fb468c..e2098de18 100644
--- a/api/pango-api.xml
+++ b/api/pango-api.xml
@@ -949,7 +949,7 @@
         <return-type type="void"/>
       </method>
     </boxed>
-    <alias name="Glyph" cname="PangoGlyph" type="guint32 "/>
+    <alias name="Glyph" cname="PangoGlyph" type="guint32"/>
     <struct name="GlyphGeometry" cname="PangoGlyphGeometry">
       <field cname="width" type="PangoGlyphUnit"/>
       <field cname="x_offset" type="PangoGlyphUnit"/>
@@ -1031,7 +1031,7 @@
         </parameters>
       </method>
     </boxed>
-    <alias name="GlyphUnit" cname="PangoGlyphUnit" type="gint32 "/>
+    <alias name="GlyphUnit" cname="PangoGlyphUnit" type="gint32"/>
     <struct name="GlyphVisAttr" cname="PangoGlyphVisAttr">
       <field cname="is_cluster_start" bits="1" type="guint"/>
     </struct>
@@ -1394,7 +1394,7 @@
         </parameters>
       </method>
     </struct>
-    <alias name="OTTag" cname="PangoOTTag" type="guint32  "/>
+    <alias name="OTTag" cname="PangoOTTag" type="guint32"/>
     <struct name="Rectangle" cname="PangoRectangle">
       <field cname="x" type="int"/>
       <field cname="y" type="int"/>
@@ -1502,6 +1502,6 @@
         </parameters>
       </method>
     </struct>
-    <alias name="XSubfont" cname="PangoXSubfont" type="guint16 "/>
+    <alias name="XSubfont" cname="PangoXSubfont" type="guint16"/>
   </namespace>
 </api>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 242df589a..cc7869efe 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -55,8 +55,8 @@ while ($line = <STDIN>) {
 		# fixme: siiigh
 		$2 = "GdkDrawable" if ($1 eq "_GdkDrawable");
 		$types{$2} = $1;
-	} elsif ($line =~ /typedef\s+(\w+\s+\**)(\w+);/) {
-		$types{$2} = $1;
+	} elsif ($line =~ /typedef\s+(\w+)\s+(\**)(\w+);/) {
+		$types{$3} = $1 . $2;
 	} elsif ($line =~ /typedef\s+enum/) {
 		$ename = $1;
 		$edef = $line;