diff --git a/ChangeLog b/ChangeLog
index 85a14518f..dd291423c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-08  Mike Kestner  <mkestner@novell.com>
+
+	* */*.raw : regen.
+	* parser/gapi2xml.pl : access comment doesn't have to start at
+	beginning of line.
+
 2005-07-08  Mike Kestner  <mkestner@novell.com>
 
 	* pango/*.raw : regen.
diff --git a/doc/en/Gnome/Dialog.xml b/doc/en/Gnome/Dialog.xml
index 33133a8db..93ab9dcf8 100644
--- a/doc/en/Gnome/Dialog.xml
+++ b/doc/en/Gnome/Dialog.xml
@@ -360,5 +360,17 @@
         </Attribute>
       </Attributes>
     </Member>
+  <Member MemberName="Vbox">
+      <MemberSignature Language="C#" Value="public Gtk.Widget Vbox { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gtk.Widget</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Gtk/Combo.xml b/doc/en/Gtk/Combo.xml
index 4488017f2..9ae9507b9 100644
--- a/doc/en/Gtk/Combo.xml
+++ b/doc/en/Gtk/Combo.xml
@@ -354,5 +354,17 @@ class ComboSample
         </remarks>
       </Docs>
     </Member>
+  <Member MemberName="List">
+      <MemberSignature Language="C#" Value="public Gtk.Widget List { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gtk.Widget</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/gnome/gnome-api.raw b/gnome/gnome-api.raw
index a7d563839..8b8e8828d 100644
--- a/gnome/gnome-api.raw
+++ b/gnome/gnome-api.raw
@@ -2943,7 +2943,7 @@
       </method>
     </object>
     <object name="Dialog" cname="GnomeDialog" deprecated="1" parent="GtkWindow">
-      <field name="Vbox" cname="vbox" type="GtkWidget*" />
+      <field name="Vbox" cname="vbox" type="GtkWidget*" access="public" />
       <field name="Buttons" cname="buttons" type="GList*" />
       <field name="ActionArea" cname="action_area" type="GtkWidget*" />
       <field name="Accelerators" cname="accelerators" type="GtkAccelGroup*" />
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 1d593f451..240c41d89 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -204,7 +204,6 @@
   <attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Button']" name="type">GtkButton*</attr>
   <attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Button']" name="access">public</attr>
   <attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Entry']" name="type">GtkEntry*</attr>
-  <attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Entry']" name="access">public</attr>
   <attr path="/api/namespace/object[@cname='GtkCombo']/method[@name='SetPopdownStrings']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkComboBox']/method[@name='GetActiveIter']/*/*[@type='GtkTreeIter*']" name="pass_as">out</attr> 
   <add-node path="/api/namespace/object[@cname='GtkContainer']"><implements><interface name="IEnumerable" /></implements></add-node>
diff --git a/gtk/gtk-api-2.4.raw b/gtk/gtk-api-2.4.raw
index d89383b62..dcd4ccf75 100644
--- a/gtk/gtk-api-2.4.raw
+++ b/gtk/gtk-api-2.4.raw
@@ -3967,11 +3967,11 @@
       </constructor>
     </object>
     <object name="Combo" cname="GtkCombo" deprecated="1" parent="GtkHBox">
-      <field name="Entry" cname="entry" type="GtkWidget*" />
+      <field name="Entry" cname="entry" type="GtkWidget*" access="public" />
       <field name="Button" cname="button" type="GtkWidget*" />
       <field name="Popup" cname="popup" type="GtkWidget*" />
       <field name="Popwin" cname="popwin" type="GtkWidget*" />
-      <field name="List" cname="list" type="GtkWidget*" />
+      <field name="List" cname="list" type="GtkWidget*" access="public" />
       <field name="EntryChangeId" cname="entry_change_id" type="guint" />
       <field name="ListChangeId" cname="list_change_id" type="guint" />
       <field name="ValueInList" cname="value_in_list" bits="1" type="guint" />
diff --git a/gtk/gtk-api-2.6.raw b/gtk/gtk-api-2.6.raw
index 79158ca90..38e06885e 100644
--- a/gtk/gtk-api-2.6.raw
+++ b/gtk/gtk-api-2.6.raw
@@ -4244,11 +4244,11 @@
       </constructor>
     </object>
     <object name="Combo" cname="GtkCombo" deprecated="1" parent="GtkHBox">
-      <field name="Entry" cname="entry" type="GtkWidget*" />
+      <field name="Entry" cname="entry" type="GtkWidget*" access="public" />
       <field name="Button" cname="button" type="GtkWidget*" />
       <field name="Popup" cname="popup" type="GtkWidget*" />
       <field name="Popwin" cname="popwin" type="GtkWidget*" />
-      <field name="List" cname="list" type="GtkWidget*" />
+      <field name="List" cname="list" type="GtkWidget*" access="public" />
       <field name="EntryChangeId" cname="entry_change_id" type="guint" />
       <field name="ListChangeId" cname="list_change_id" type="guint" />
       <field name="ValueInList" cname="value_in_list" bits="1" type="guint" />
diff --git a/pango/pango-api-2.6.raw b/pango/pango-api-2.6.raw
index ed2cc2f09..3600f36bb 100644
--- a/pango/pango-api-2.6.raw
+++ b/pango/pango-api-2.6.raw
@@ -668,7 +668,7 @@
       <field name="Strikethrough" cname="strikethrough" type="gboolean" />
       <field name="ActiveCount" cname="active_count" type="int" />
       <field name="Matrix" cname="matrix" type="PangoMatrix*" access="public" />
-      <field name="Priv" cname="priv" type="PangoRendererPrivate*" access="public" />
+      <field name="Priv" cname="priv" type="PangoRendererPrivate*" />
       <virtual_method name="DrawGlyphs" cname="draw_glyphs">
         <return-type type="void" />
         <parameters>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 8fc5aa4bf..7a6d7115e 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -497,7 +497,7 @@ sub addFieldElems
 	my $access = $defaultaccess;
 
 	foreach $field (@fields) {
-		if ($field =~ m!^/\*< (public|private) >.*\*/(.*)$!) {
+		if ($field =~ m!/\*< (public|private) >.*\*/(.*)$!) {
 			$access = $1;
 			$field = $2;
 		}