diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index aa9e866b8..f97f4e1b5 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-18  Richard Hestilow  <hestilow@ximian.com>
+
+	* main.c (create_dialog): Revert to old prototype.
+	(setup_dialog): Moved signal_connect on demo button to here.
+
 2001-07-18  Richard Hestilow  <hestilow@ximian.com>
 
 	* Rewritten to use bonobo-conf.
diff --git a/capplets/keyboard/main.c b/capplets/keyboard/main.c
index 7c826ddff..d9c2af707 100644
--- a/capplets/keyboard/main.c
+++ b/capplets/keyboard/main.c
@@ -125,7 +125,7 @@ bell_cb (GtkWidget *widget, Bonobo_PropertyBag bag)
 }
 
 static GtkWidget*
-create_dialog (Bonobo_PropertyBag bag)
+create_dialog (void)
 {
 	GladeXML *dialog;
 	GtkWidget *widget, *pixmap;
@@ -141,9 +141,6 @@ create_dialog (Bonobo_PropertyBag bag)
 			    TRUE, TRUE, 0);
 	gtk_widget_show_all (WID ("bell_test_button"));
 
-	gtk_signal_connect (GTK_OBJECT (WID ("bell_test_button")),
-			    "clicked", bell_cb, bag);
-
 	gtk_signal_connect_object (GTK_OBJECT (widget), "destroy",
 				   GTK_SIGNAL_FUNC (gtk_object_destroy),
 				   GTK_OBJECT (dialog));
@@ -183,6 +180,9 @@ setup_dialog (GtkWidget *widget, Bonobo_PropertyBag bag)
 
 	ed = BONOBO_PEDITOR (bonobo_peditor_range_construct (WID ("bell_duration_range")));
 	bonobo_peditor_set_property (ed, bag, "bell_duration", TC_ulong, NULL);
+
+	gtk_signal_connect (GTK_OBJECT (WID ("bell_test_button")),
+		    "clicked", bell_cb, bag);
 }
 
 static void