diff --git a/ChangeLog b/ChangeLog
index 947ad3f0e..8ecd36b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-10  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Gtk.metadata : mark some Dialog API params as ResponseType 
+	instead of int.
+	[fixes #58240]
+
 2004-05-10  Mike Kestner  <mkestner@ximian.com>
 
 	* glib/Value.cs : fix GBoxed GLib.Value setting.
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index e12223fcd..a864adb19 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -101,6 +101,9 @@
   <attr path="/api/namespace/object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr>
   <attr path="/api/namespace/object[@cname='GtkDialog']/constructor[@cname='gtk_dialog_new_with_buttons']/*/*[@type='GtkWindow*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr>
+  <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetDefaultResponse']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
+  <attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetResponseSensitive']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
+  <attr path="/api/namespace/object[@cname='GtkDialog']/signal[@name='Response']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
   <attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='Activate']" name="name">Activated</attr>
   <attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='CopyClipboard']" name="name">ClipboardCopied</attr>
   <attr path="/api/namespace/object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
diff --git a/sample/GtkDemo/DemoSizeGroup.cs b/sample/GtkDemo/DemoSizeGroup.cs
index 44ee194f7..6b08ceb73 100644
--- a/sample/GtkDemo/DemoSizeGroup.cs
+++ b/sample/GtkDemo/DemoSizeGroup.cs
@@ -149,7 +149,7 @@ namespace GtkDemo
 		private void ResponseCallback (object obj, ResponseArgs args)
         
                {
-		       if (args.ResponseId == 5) {
+		       if (((int) args.ResponseId) == 5) {
 			       window.Hide ();
 			       window.Destroy ();}
 	       }