[pango/fontset-revive] Undo fontset deprecations

[Matthias Clasen <matthiasc src gnome org>]

commit b146c2154c174c6ec3f504cb741339386fe655ba
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 1 13:43:04 2019 -0400

    Undo fontset deprecations
    
    PangoFontsetSimple is used by the win32 fontmap
    implementation, so deprecating it is impractical.

 pango/pango-fontset.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index 4f2590b5..ce7d4107 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -69,8 +69,6 @@ typedef gboolean (*PangoFontsetForeachFunc) (PangoFontset  *fontset,
                                             PangoFont     *font,
                                             gpointer       user_data);
 
-#ifndef PANGO_DISABLE_DEPRECATED
-
 /**
  * PangoFontset:
  *
@@ -145,19 +143,17 @@ typedef struct _PangoFontsetSimple  PangoFontsetSimple;
 typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
 
 
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
 GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
 
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
 PangoFontsetSimple * pango_fontset_simple_new    (PangoLanguage      *language);
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
 void                 pango_fontset_simple_append (PangoFontsetSimple *fontset,
                                                   PangoFont          *font);
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
 int                  pango_fontset_simple_size   (PangoFontsetSimple *fontset);
 
-#endif  /* PANGO_DISABLE_DEPRECATED */
-
 
 PANGO_AVAILABLE_IN_ALL
 PangoFont *       pango_fontset_get_font    (PangoFontset           *fontset,