Bug 547432: Deprecation of pango_(backend)_font_map_create_context() not

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


svn path=/trunk/; revision=2689

7 files changed, 31 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fd22495..4d21e4da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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
+
 2008-08-11  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 547303 – pango_layout_get_cursor_pos crashes on certain text
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index 11f663da..3731196e 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -255,12 +255,11 @@ pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap)
  *
  * 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)
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 053c3461..e3963e84 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1415,12 +1415,11 @@ _pango_fc_font_map_fc_to_coverage (FcCharSet *charset)
  * 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)
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index f14ab9aa..44b28266 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -217,12 +217,11 @@ pango_ft2_font_map_set_resolution (PangoFT2FontMap *fontmap,
  *
  * 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 @@ pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap)
  * (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)
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 889472b5..d2e8ad5f 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -121,12 +121,11 @@ pango_win32_get_hfont (PangoFont *font)
  * 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)
diff --git a/pango/pangox.c b/pango/pangox.c
index 36ae85fb..92bedff8 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -189,10 +189,10 @@ get_context_info (PangoContext *context)
  * 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)
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index d2f582f0..526998a9 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -317,11 +317,10 @@ _pango_xft_font_map_get_info (PangoFontMap *fontmap,
  * 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,