diff --git a/ChangeLog b/ChangeLog
index b66f443e..21cffcba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-28  Joaquin Cuenca Abela  <e98cuenc@yahoo.com>
+
+	* widgets/gtkdialog.xml: comment out "response-id" as a ChildProperty
+	to retain compatibility with glade-2.  We should reput "response-id"
+	as a ChildProperty if that gets indeed accepted as a child-property
+	in gtk+ itself.
+	* widgets/gtkbutton.xml: add a "response-id" property to each button,
+	to keep backwards compatibility with glade-2.
+
 2004-02-28  Joaquin Cuenca Abela  <e98cuenc@yahoo.com>
 
 	* src/glade-editor.c: restrict child-properties to widgets for which
diff --git a/widgets/gtkbutton.xml b/widgets/gtkbutton.xml
index b65af2f2..8dd3fcd2 100644
--- a/widgets/gtkbutton.xml
+++ b/widgets/gtkbutton.xml
@@ -13,8 +13,16 @@
         <Enum Id="gtk-apply" Name="Apply"/>
         <Enum Id="gtk-close" Name="Close"/>
       </Enums>
-    <SetFunction>glade_gtk_button_set_stock</SetFunction>
+      <SetFunction>glade_gtk_button_set_stock</SetFunction>
     </Property>
+
+    <Property Id="response-id" Name="Response ID" Default="0" Common="False">
+      <Type>Integer</Type>
+      <Tooltip>The response ID of this button in a dialog (it's NOT useful if this button is not in a GtkDialog)</Tooltip>
+      <SetFunction>ignore</SetFunction>
+      <GetFunction>ignore</GetFunction>
+    </Property>
+
   </Properties>
   
 </GladeWidgetClass>
diff --git a/widgets/gtkdialog.xml b/widgets/gtkdialog.xml
index 58388b86..b30109a2 100644
--- a/widgets/gtkdialog.xml
+++ b/widgets/gtkdialog.xml
@@ -18,6 +18,9 @@
     </Property>
   </Properties>
 
+<!-- That's supported, and IMO is the right way to handle response-id (and it works),
+     but it's not backwards compatible with response-id being a property as in glade-2.
+     So by now we will just add a fake response-id property to buttons
   <ChildProperties>
     <Property Id="response-id" Name="Response ID" Default="0" Common="False">
       <Type>Integer</Type>
@@ -26,5 +29,6 @@
       <GetFunction>ignore</GetFunction>
     </Property>
   </ChildProperties>
+-->
 
 </GladeWidgetClass>