gtk+ r20962 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Mon Aug  4 10:33:02 2008
New Revision: 20962
URL: http://svn.gnome.org/viewvc/gtk+?rev=20962&view=rev

Log:
2008-08-04  Michael Natterer  <mitch imendio com>

	* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_font):
	avoid our own deprecated public API and use
	gtk_font_selection_get_font_internal() instead of
	gtk_font_selection_get_font().

	(gtk_font_selection_get_font)
	(gtk_font_selection_dialog_get_font): Add missing
	"Deprecated: 2.0" to the api doc comments.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfontsel.c

Modified: trunk/gtk/gtkfontsel.c
==============================================================================
--- trunk/gtk/gtkfontsel.c	(original)
+++ trunk/gtk/gtkfontsel.c	Mon Aug  4 10:33:02 2008
@@ -1314,14 +1314,16 @@
 /**
  * gtk_font_selection_get_font:
  * @fontsel: a #GtkFontSelection
- * 
- * Return value: A #GdkFont.  
+ *
+ * Return value: A #GdkFont.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_get_font_name() instead.
  **/
 GdkFont *
 gtk_font_selection_get_font (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-  
+
   return gtk_font_selection_get_font_internal (fontsel);
 }
 
@@ -1709,13 +1711,15 @@
  *
  * Return value: the #GdkFont from the #GtkFontSelection for the
  * currently selected font in the dialog.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_dialog_get_font_name() instead.
  */
 GdkFont*
 gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
 
-  return gtk_font_selection_get_font (GTK_FONT_SELECTION (fsd->fontsel));
+  return gtk_font_selection_get_font_internal (GTK_FONT_SELECTION (fsd->fontsel));
 }
 
 /**