diff --git a/ChangeLog b/ChangeLog
index 072cb6ede7..317e9f7380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkpaned.c (gtk_paned_class_init):
+	s/CYCLE_HANDLE_FOCUS/CYCLE_CHILD_FOCUS/
+
+	* gtk/gtkfontbutton.c (gtk_font_button_class_init):
+	s/PROP_SHOW_SIZE/PROP_SHOW_STYLE/
+
+	Both pointed out by Tommi Komulainen.
+
 Sun Aug 22 13:44:53 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init): Use PROP_MAX_POSITION,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 072cb6ede7..317e9f7380 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkpaned.c (gtk_paned_class_init):
+	s/CYCLE_HANDLE_FOCUS/CYCLE_CHILD_FOCUS/
+
+	* gtk/gtkfontbutton.c (gtk_font_button_class_init):
+	s/PROP_SHOW_SIZE/PROP_SHOW_STYLE/
+
+	Both pointed out by Tommi Komulainen.
+
 Sun Aug 22 13:44:53 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init): Use PROP_MAX_POSITION,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 072cb6ede7..317e9f7380 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkpaned.c (gtk_paned_class_init):
+	s/CYCLE_HANDLE_FOCUS/CYCLE_CHILD_FOCUS/
+
+	* gtk/gtkfontbutton.c (gtk_font_button_class_init):
+	s/PROP_SHOW_SIZE/PROP_SHOW_STYLE/
+
+	Both pointed out by Tommi Komulainen.
+
 Sun Aug 22 13:44:53 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init): Use PROP_MAX_POSITION,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 072cb6ede7..317e9f7380 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sun Aug 22 15:46:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkpaned.c (gtk_paned_class_init):
+	s/CYCLE_HANDLE_FOCUS/CYCLE_CHILD_FOCUS/
+
+	* gtk/gtkfontbutton.c (gtk_font_button_class_init):
+	s/PROP_SHOW_SIZE/PROP_SHOW_STYLE/
+
+	Both pointed out by Tommi Komulainen.
+
 Sun Aug 22 13:44:53 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtkpaned.c (gtk_paned_class_init): Use PROP_MAX_POSITION,
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 72c5c5de9f..b26b8af383 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -236,7 +236,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
    * Since: 2.4
    */
   g_object_class_install_property (gobject_class,
-                                   PROP_SHOW_SIZE,
+                                   PROP_SHOW_STYLE,
                                    g_param_spec_boolean ("show_style",
                                                          P_("Show style"),
                                                          P_("Whether the selected font style is shown in the label"),
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 731dd886e1..3184d8ee19 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -327,7 +327,7 @@ gtk_paned_class_init (GtkPanedClass *class)
 								    TRUE,
 								    G_PARAM_READWRITE));
 
-  signals [CYCLE_HANDLE_FOCUS] =
+  signals [CYCLE_CHILD_FOCUS] =
     g_signal_new ("cycle_child_focus",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,