diff --git a/ChangeLog b/ChangeLog
index cac996aa9b..df1cce6611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-03  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor):
+	don't use non-existing local variables.
+
 2006-04-29  Behdad Esfahbod  <behdad@gnome.org>
 
 	* gtk/gtkwidget.c (gtk_widget_create_pango_layout)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cac996aa9b..df1cce6611 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-03  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor):
+	don't use non-existing local variables.
+
 2006-04-29  Behdad Esfahbod  <behdad@gnome.org>
 
 	* gtk/gtkwidget.c (gtk_widget_create_pango_layout)
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 0ebbf55b81..462c5d9f33 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -637,7 +637,8 @@ gtk_file_chooser_button_constructor (GType                  type,
 
   /* Set the default title if necessary. We must wait until the dialog has been created to do this. */
   if (!priv->has_title)
-    gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
+    gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (object),
+				       _(DEFAULT_TITLE));
 
   current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (priv->dialog));
   if (current_folder != NULL)