diff --git a/ChangeLog b/ChangeLog
index 9faaef03f..205c040d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-01  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/gtk-api-2.10.raw : reparsed
+	* parser/gapi_pp.pl : put a newline after G_DEFINE_TYPE macros
+	on the output and do a next if we shouldn't fall out of the 
+	branch.
+
 2006-07-29  Alp Toker  <alp@atoker.com>
 
 	* sample/GstPlayer.cs: Remove the 2002 GStreamer sample. gst-sharp has
diff --git a/gtk/gtk-api-2.10.raw b/gtk/gtk-api-2.10.raw
index a31209cdd..3f9bd856e 100644
--- a/gtk/gtk-api-2.10.raw
+++ b/gtk/gtk-api-2.10.raw
@@ -12697,6 +12697,46 @@
       <field name="Numeric" cname="numeric" bits="1" type="guint" />
       <field name="Wrap" cname="wrap" bits="1" type="guint" />
       <field name="SnapToTicks" cname="snap_to_ticks" bits="1" type="guint" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" />
+      <property name="ClimbRate" cname="climb-rate" type="gdouble" readable="true" writeable="true" />
+      <property name="Digits" cname="digits" type="guint" readable="true" writeable="true" />
+      <property name="SnapToTicks" cname="snap-to-ticks" type="gboolean" readable="true" writeable="true" />
+      <property name="Numeric" cname="numeric" type="gboolean" readable="true" writeable="true" />
+      <property name="Wrap" cname="wrap" type="gboolean" readable="true" writeable="true" />
+      <property name="UpdatePolicy" cname="update-policy" type="GtkSpinButtonUpdatePolicy" readable="true" writeable="true" />
+      <property name="Value" cname="value" type="gdouble" readable="true" writeable="true" />
+      <signal name="Input" cname="input" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+          <parameter type="gdouble*" name="new_value" />
+        </parameters>
+      </signal>
+      <signal name="Output" cname="output" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+        </parameters>
+      </signal>
+      <signal name="ValueChanged" cname="value_changed" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+        </parameters>
+      </signal>
+      <signal name="Wrapped" cname="wrapped" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+        </parameters>
+      </signal>
+      <signal name="ChangeValue" cname="change_value" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSpinButton*" name="spin_button" />
+          <parameter type="GtkScrollType" name="scroll" />
+        </parameters>
+      </signal>
       <implements>
         <interface cname="GtkEditable" />
       </implements>
diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl
index a94ca3ff0..fcfe0acf4 100755
--- a/parser/gapi_pp.pl
+++ b/parser/gapi_pp.pl
@@ -210,7 +210,8 @@ foreach $fname (@srcs, @privhdrs) {
 				}
 				$line = <INFILE>;
 			} while ($parens > 0);
-			print $macro;
+			print "$macro\n";
+			next if ($line !~ /^(struct|\w+_class_init|\w+_base_init)/);
 		}
 
 		if ($line =~ /^struct/) {