diff --git a/ChangeLog b/ChangeLog
index 8a297aeed7..c7659244cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-31  Christian Dywan  <christian@imendio.com>
+
+	Bug 558667 – gtk_font_selection_dialog_get_apply_button - deprecate?
+
+	* gtk/gtk.symbols:
+	* gtk/gtkfontsel.c:
+	* gtk/gtkfontsel.h:
+	Deprecate gtk_font_selection_dialog_get_apply_button
+
 2008-10-31  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 558323 – glitches when popping up combos in treeviews
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 322eb4fbed..ca24e372b9 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1601,7 +1601,6 @@ gtk_font_button_set_use_size
 
 #if IN_HEADER(__GTK_FONTSEL_H__)
 #if IN_FILE(__GTK_FONTSEL_C__)
-gtk_font_selection_dialog_get_apply_button
 gtk_font_selection_dialog_get_cancel_button
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_ok_button
@@ -1611,6 +1610,7 @@ gtk_font_selection_dialog_new
 gtk_font_selection_dialog_set_font_name
 gtk_font_selection_dialog_set_preview_text
 #ifndef GTK_DISABLE_DEPRECATED
+gtk_font_selection_dialog_get_apply_button
 gtk_font_selection_get_font
 gtk_font_selection_dialog_get_font
 #endif
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index d9d4766dba..949a371462 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1593,11 +1593,13 @@ gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd)
  * gtk_font_selection_dialog_get_apply_button:
  * @fsd: a #GtkFontSelectionDialog
  *
- * Gets the 'Apply' button.
+ * Obtains a button. The button doesn't have any function.
  *
- * Return value: the #GtkWidget used in the dialog for the 'Apply' button.
+ * Return value: a #GtkWidget
  *
  * Since: 2.14
+ *
+ * Deprecated: 2.16: Don't use this function.
  */
 GtkWidget *
 gtk_font_selection_dialog_get_apply_button (GtkFontSelectionDialog *fsd)
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index d475dc6b96..6cf97359d1 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -176,7 +176,9 @@ GType	   gtk_font_selection_dialog_get_type	       (void) G_GNUC_CONST;
 GtkWidget *gtk_font_selection_dialog_new	       (const gchar            *title);
 
 GtkWidget *gtk_font_selection_dialog_get_ok_button     (GtkFontSelectionDialog *fsd);
+#ifndef GTK_DISABLE_DEPRECATED
 GtkWidget *gtk_font_selection_dialog_get_apply_button  (GtkFontSelectionDialog *fsd);
+#endif
 GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog *fsd);
 
 /* This returns the X Logical Font Description fontname, or NULL if no font