diff --git a/ChangeLog b/ChangeLog
index 57487de6e..6e1f42e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,23 @@
+<<<<<<< .mine
+2005-06-10  Dan Winship  <danw@novell.com>
+
+	* parser/gapi2xml.pl (addPropElem): Distinguish CONSTRUCT ("must
+	be set at construct time") and CONSTRUCT_ONLY ("can only be set at
+	construct time") properties, rather than marking them all
+	"construct-only".
+
+	* gnome/gnome-api.raw: 
+	* gtk/gtk-api-2.4.raw: 
+	* gtk/gtk-api-2.6.raw: Regen, causing a few formerly-read-only
+	properties to become writable.
+
+=======
 2005-06-10  Mike Kestner  <mkestner@novell.com>
 
 	* glade/XML.custom : add a try block on field autoconnect to make it
 	easier to catch type mismatches and such.  Suggestion from Gonzalito.
 
+>>>>>>> .r45766
 2005-06-09  Lluis Sanchez  <lluis@novell.com>
 
 	* glib/Marshaller.cs: Added null check in FilenamePtrToString.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index bd45c10a7..fa7dbb94c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-10  Dan Winship  <danw@novell.com>
+
+	* en/Gnome/App.xml (AppId):
+	* en/Gnome/AppBar.xml (Interactivity, HasProgress, HasStatus):
+	* en/Gtk/MessageDialog.xml (MessageType): now read-write
+
 2005-06-06  Dan Winship  <danw@novell.com>
 
 	* en/Gdk/PangoRenderer.xml: update return type of GetDefault
diff --git a/doc/en/Gnome/App.xml b/doc/en/Gnome/App.xml
index a13f37a98..18451adc1 100644
--- a/doc/en/Gnome/App.xml
+++ b/doc/en/Gnome/App.xml
@@ -628,7 +628,7 @@
       </Docs>
     </Member>
     <Member MemberName="AppId">
-      <MemberSignature Language="C#" Value="public string AppId { get; };" />
+      <MemberSignature Language="C#" Value="public string AppId { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
diff --git a/doc/en/Gnome/AppBar.xml b/doc/en/Gnome/AppBar.xml
index bfe05b686..1f7ce2713 100644
--- a/doc/en/Gnome/AppBar.xml
+++ b/doc/en/Gnome/AppBar.xml
@@ -219,7 +219,7 @@
       </Docs>
     </Member>
     <Member MemberName="Interactivity">
-      <MemberSignature Language="C#" Value="public Gnome.PreferencesType Interactivity { get; };" />
+      <MemberSignature Language="C#" Value="public Gnome.PreferencesType Interactivity { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Gnome.PreferencesType</ReturnType>
@@ -236,7 +236,7 @@
         </Attribute>
       </Attributes></Member>
     <Member MemberName="HasProgress">
-      <MemberSignature Language="C#" Value="public bool HasProgress { get; };" />
+      <MemberSignature Language="C#" Value="public bool HasProgress { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
@@ -253,7 +253,7 @@
         </Attribute>
       </Attributes></Member>
     <Member MemberName="HasStatus">
-      <MemberSignature Language="C#" Value="public bool HasStatus { get; };" />
+      <MemberSignature Language="C#" Value="public bool HasStatus { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
diff --git a/doc/en/Gtk/MessageDialog.xml b/doc/en/Gtk/MessageDialog.xml
index 433f22189..ccd6cde6d 100644
--- a/doc/en/Gtk/MessageDialog.xml
+++ b/doc/en/Gtk/MessageDialog.xml
@@ -156,7 +156,7 @@ MessageDialog md = new MessageDialog
       </Docs>
     </Member>
     <Member MemberName="MessageType">
-      <MemberSignature Language="C#" Value="public Gtk.MessageType MessageType { get; };" />
+      <MemberSignature Language="C#" Value="public Gtk.MessageType MessageType { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Gtk.MessageType</ReturnType>
diff --git a/gnome/gnome-api.raw b/gnome/gnome-api.raw
index 391aa2406..a7d563839 100644
--- a/gnome/gnome-api.raw
+++ b/gnome/gnome-api.raw
@@ -2023,7 +2023,7 @@
       <field name="AccelGroup" cname="accel_group" type="GtkAccelGroup*" />
       <field name="EnableLayoutConfig" cname="enable_layout_config" bits="1" type="guint" />
       <field name="Priv" cname="_priv" type="GnomeAppPrivate*" />
-      <property name="AppId" cname="app_id" type="gchar*" readable="true" writeable="true" construct-only="true" />
+      <property name="AppId" cname="app_id" type="gchar*" readable="true" writeable="true" construct="true" />
       <method name="AddDockItem" cname="gnome_app_add_dock_item">
         <return-type type="void" />
         <parameters>
@@ -2449,9 +2449,9 @@
           <parameter type="GnomeAppBar*" name="ab" />
         </parameters>
       </signal>
-      <property name="HasProgress" cname="has_progress" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="HasStatus" cname="has_status" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="Interactivity" cname="interactivity" type="GnomePreferencesType" readable="true" writeable="true" construct-only="true" />
+      <property name="HasProgress" cname="has_progress" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="HasStatus" cname="has_status" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="Interactivity" cname="interactivity" type="GnomePreferencesType" readable="true" writeable="true" construct="true" />
       <method name="ClearPrompt" cname="gnome_appbar_clear_prompt">
         <return-type type="void" />
       </method>
diff --git a/gtk/gtk-api-2.4.raw b/gtk/gtk-api-2.4.raw
index 87d44f525..3d3a4ad7b 100644
--- a/gtk/gtk-api-2.4.raw
+++ b/gtk/gtk-api-2.4.raw
@@ -2898,9 +2898,9 @@
       <field name="Depressed" cname="depressed" bits="1" type="guint" />
       <field name="DepressOnActivate" cname="depress_on_activate" bits="1" type="guint" />
       <field name="FocusOnClick" cname="focus_on_click" bits="1" type="guint" />
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true" />
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct="true" />
       <property name="FocusOnClick" cname="focus_on_click" type="gboolean" readable="true" writeable="true" />
       <property name="Relief" cname="relief" type="GtkReliefStyle" readable="true" writeable="true" />
       <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
@@ -5006,10 +5006,10 @@
     </object>
     <object name="Expander" cname="GtkExpander" parent="GtkBin">
       <field name="Priv" cname="priv" type="GtkExpanderPrivate*" />
-      <property name="Expanded" cname="expanded" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true" />
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="UseMarkup" cname="use_markup" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Expanded" cname="expanded" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct="true" />
+      <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">
@@ -7338,7 +7338,7 @@
     <object name="MessageDialog" cname="GtkMessageDialog" parent="GtkDialog">
       <field name="Image" cname="image" type="GtkWidget*" />
       <field name="Label" cname="label" type="GtkWidget*" />
-      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct-only="true" />
+      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct="true" />
       <property name="Buttons" cname="buttons" type="GtkButtonsType" writeable="true" construct-only="true" />
       <method name="GetType" cname="gtk_message_dialog_get_type" shared="true">
         <return-type type="GType" />
@@ -8408,7 +8408,7 @@
         </parameters>
       </signal>
       <property name="UpdatePolicy" cname="update_policy" type="GtkUpdateType" readable="true" writeable="true" />
-      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct="true" />
       <property name="Inverted" cname="inverted" type="gboolean" readable="true" writeable="true" />
       <virtual_method name="GetRangeBorder" cname="get_range_border">
         <return-type type="void" />
@@ -8675,8 +8675,8 @@
       <field name="WindowPlacement" cname="window_placement" bits="2" type="guint" />
       <field name="FocusOut" cname="focus_out" bits="1" type="guint" />
       <field name="ShadowType" cname="shadow_type" type="guint16" />
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <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="HscrollbarPolicy" cname="hscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
       <property name="VscrollbarPolicy" cname="vscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
       <property name="WindowPlacement" cname="window_placement" type="GtkCornerType" readable="true" writeable="true" />
@@ -12992,8 +12992,8 @@
       <field name="BinWindow" cname="bin_window" type="GdkWindow*" />
       <field name="Hadjustment" cname="hadjustment" type="GtkAdjustment*" />
       <field name="Vadjustment" cname="vadjustment" type="GtkAdjustment*" />
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <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">
         <return-type type="void" />
diff --git a/gtk/gtk-api-2.6.raw b/gtk/gtk-api-2.6.raw
index 49deb7ee2..d30449e4e 100644
--- a/gtk/gtk-api-2.6.raw
+++ b/gtk/gtk-api-2.6.raw
@@ -3123,9 +3123,9 @@
       <field name="Depressed" cname="depressed" bits="1" type="guint" />
       <field name="DepressOnActivate" cname="depress_on_activate" bits="1" type="guint" />
       <field name="FocusOnClick" cname="focus_on_click" bits="1" type="guint" />
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true" />
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="UseStock" cname="use_stock" type="gboolean" readable="true" writeable="true" construct="true" />
       <property name="FocusOnClick" cname="focus_on_click" type="gboolean" readable="true" writeable="true" />
       <property name="Relief" cname="relief" type="GtkReliefStyle" readable="true" writeable="true" />
       <property name="Xalign" cname="xalign" type="gfloat" readable="true" writeable="true" />
@@ -5397,10 +5397,10 @@
     </object>
     <object name="Expander" cname="GtkExpander" parent="GtkBin">
       <field name="Priv" cname="priv" type="GtkExpanderPrivate*" />
-      <property name="Expanded" cname="expanded" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct-only="true" />
-      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct-only="true" />
-      <property name="UseMarkup" cname="use_markup" type="gboolean" readable="true" writeable="true" construct-only="true" />
+      <property name="Expanded" cname="expanded" type="gboolean" readable="true" writeable="true" construct="true" />
+      <property name="Label" cname="label" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="UseUnderline" cname="use_underline" type="gboolean" readable="true" writeable="true" construct="true" />
+      <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">
@@ -8173,7 +8173,7 @@
     <object name="MessageDialog" cname="GtkMessageDialog" parent="GtkDialog">
       <field name="Image" cname="image" type="GtkWidget*" />
       <field name="Label" cname="label" type="GtkWidget*" />
-      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct-only="true" />
+      <property name="MessageType" cname="message_type" type="GtkMessageType" readable="true" writeable="true" construct="true" />
       <property name="Buttons" cname="buttons" type="GtkButtonsType" writeable="true" construct-only="true" />
       <method name="FormatSecondaryMarkup" cname="gtk_message_dialog_format_secondary_markup">
         <return-type type="void" />
@@ -9276,7 +9276,7 @@
         </parameters>
       </signal>
       <property name="UpdatePolicy" cname="update_policy" type="GtkUpdateType" readable="true" writeable="true" />
-      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <property name="Adjustment" cname="adjustment" type="GtkAdjustment" readable="true" writeable="true" construct="true" />
       <property name="Inverted" cname="inverted" type="gboolean" readable="true" writeable="true" />
       <virtual_method name="GetRangeBorder" cname="get_range_border">
         <return-type type="void" />
@@ -9543,8 +9543,8 @@
       <field name="WindowPlacement" cname="window_placement" bits="2" type="guint" />
       <field name="FocusOut" cname="focus_out" bits="1" type="guint" />
       <field name="ShadowType" cname="shadow_type" type="guint16" />
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <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="HscrollbarPolicy" cname="hscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
       <property name="VscrollbarPolicy" cname="vscrollbar_policy" type="GtkPolicyType" readable="true" writeable="true" />
       <property name="WindowPlacement" cname="window_placement" type="GtkCornerType" readable="true" writeable="true" />
@@ -13941,8 +13941,8 @@
       <field name="BinWindow" cname="bin_window" type="GdkWindow*" />
       <field name="Hadjustment" cname="hadjustment" type="GtkAdjustment*" />
       <field name="Vadjustment" cname="vadjustment" type="GtkAdjustment*" />
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" readable="true" writeable="true" construct-only="true" />
+      <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">
         <return-type type="void" />
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index e32af86bf..8d1c5f4ae 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -867,7 +867,8 @@ sub addPropElem
 
 	$prop_elem->setAttribute('readable', "true") if ($mode =~ /READ/);
 	$prop_elem->setAttribute('writeable', "true") if ($mode =~ /WRIT/);
-	$prop_elem->setAttribute('construct-only', "true") if ($mode =~ /CONS/);
+	$prop_elem->setAttribute('construct', "true") if ($mode =~ /CONSTRUCT(?!_)/);
+	$prop_elem->setAttribute('construct-only', "true") if ($mode =~ /CONSTRUCT_ONLY/);
 }
 
 sub parseTypeToken