pango r2689 - in trunk: . pango

[herzi svn gnome org]

Author: herzi
Date: Tue Aug 12 15:08:16 2008
New Revision: 2689
URL: http://svn.gnome.org/viewvc/pango?rev=2689&view=rev

Log:
2008-08-12  Sven Herzberg  <sven imendio com>

	Bug 547432: Deprecation of pango_(backend)_font_map_create_context()
	not clean
	reviewed by: Behdad Esfahbod

	* pango/pangocairo-fontmap.c,
	* pango/pangofc-fontmap.c,
	* pango/pangoft2-fontmap.c,
	* pango/pangowin32.c,
	* pango/pangox.c,
	* pango/pangoxft-fontmap.c: use "Deprecated:" for deprecation messages;
	fix the deprecation version number



Modified:
   trunk/ChangeLog
   trunk/pango/pangocairo-fontmap.c
   trunk/pango/pangofc-fontmap.c
   trunk/pango/pangoft2-fontmap.c
   trunk/pango/pangowin32.c
   trunk/pango/pangox.c
   trunk/pango/pangoxft-fontmap.c

Modified: trunk/pango/pangocairo-fontmap.c
==============================================================================
--- trunk/pango/pangocairo-fontmap.c	(original)
+++ trunk/pango/pangocairo-fontmap.c	Tue Aug 12 15:08:16 2008
@@ -255,12 +255,11 @@
  *
  * Create a #PangoContext for the given fontmap.
  *
- * As of Pango 1.20 this function is deprecated.
- * Use pango_font_map_create_context() instead.
- *
  * Return value: the newly created context; free with g_object_unref().
  *
  * Since: 1.10
+ *
+ * Deprecated: 1.22: Use pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap)

Modified: trunk/pango/pangofc-fontmap.c
==============================================================================
--- trunk/pango/pangofc-fontmap.c	(original)
+++ trunk/pango/pangofc-fontmap.c	Tue Aug 12 15:08:16 2008
@@ -1415,12 +1415,11 @@
  * needed for correct operation on the #PangoContext after calling
  * this function.
  *
- * As of Pango 1.20 this function is deprecated.
- * Use pango_font_map_create_context() instead.
- *
  * Return value: a new #PangoContext
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.22: Use pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap)

Modified: trunk/pango/pangoft2-fontmap.c
==============================================================================
--- trunk/pango/pangoft2-fontmap.c	(original)
+++ trunk/pango/pangoft2-fontmap.c	Tue Aug 12 15:08:16 2008
@@ -217,12 +217,11 @@
  *
  * Create a #PangoContext for the given fontmap.
  *
- * As of Pango 1.20 this function is deprecated.
- * Use pango_font_map_create_context() instead.
- *
  * Return value: the newly created context; free with g_object_unref().
  *
  * Since: 1.2
+ *
+ * Deprecated: 1.22: Use pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap)
@@ -241,10 +240,9 @@
  * (see pango_ft2_fontmap_get_for_display()) and sets the resolution
  * for the default fontmap to @dpi_x by @dpi_y.
  *
- * Use of this function is deprecated. Use pango_fontmap_create_context()
- * instead.
- *
  * Return value: the new #PangoContext
+ *
+ * Deprecated: 1.22: Use pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_ft2_get_context (double dpi_x, double dpi_y)

Modified: trunk/pango/pangowin32.c
==============================================================================
--- trunk/pango/pangowin32.c	(original)
+++ trunk/pango/pangowin32.c	Tue Aug 12 15:08:16 2008
@@ -121,12 +121,11 @@
  * pango_win32_get_context:
  *
  * Retrieves a #PangoContext appropriate for rendering with Windows fonts.
-  *
- * As of Pango 1.20 this function is deprecated.
- * Use pango_win32_font_map_for_display() followed by
- * pango_font_map_create_context() instead.
  *
  * Return value: the new #PangoContext
+ *
+ * Deprecated: 1.22: Use pango_win32_font_map_for_display() followed by
+ * pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_win32_get_context (void)

Modified: trunk/pango/pangox.c
==============================================================================
--- trunk/pango/pangox.c	(original)
+++ trunk/pango/pangox.c	Tue Aug 12 15:08:16 2008
@@ -189,10 +189,10 @@
  * Retrieves a #PangoContext appropriate for rendering with X fonts on the
  * given display.
  *
- * This function is deprecated.  Use pango_x_font_map_for_display() followed
- * by pango_font_map_create_context() instead.
- *
  * Return value: the new #PangoContext.
+ *
+ * Deprecated: 1.22: Use pango_x_font_map_for_display() followed by
+ * pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_x_get_context (Display *display)

Modified: trunk/pango/pangoxft-fontmap.c
==============================================================================
--- trunk/pango/pangoxft-fontmap.c	(original)
+++ trunk/pango/pangoxft-fontmap.c	Tue Aug 12 15:08:16 2008
@@ -317,11 +317,10 @@
  * Retrieves a #PangoContext appropriate for rendering with
  * Xft fonts on the given screen of the given display.
  *
- * As of Pango 1.20 this function is deprecated.
- * Use pango_xft_get_font_map() followed by
- * pango_font_map_create_context() instead.
- *
  * Return value: the new #PangoContext.
+ *
+ * Deprecated: 1.22: Use pango_xft_get_font_map() followed by
+ * pango_font_map_create_context() instead.
  **/
 PangoContext *
 pango_xft_get_context (Display *display,