Add libgobject.

Sat May 27 20:36:56 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/Makefile.am configure.in: Add libgobject.

        * pango/pango-fontmap.[ch]: GObject'ify PangoFontMap.
	(Pango now requires GLib-1.3 to compile)

	* pango/pangox-fontmap.c pango/pangox-private.h: Break
	the fontmap code in libpangox out into a separate file.

Tue May 23 10:32:25 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.c (pango_layout_set_text): Allow -1 for
	the length.

1 files changed, 0 insertions, 131 deletions

diff --git a/pango/fonts.c b/pango/fonts.c
index ad6de117..bfe022fd 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -549,134 +549,3 @@ pango_font_get_metrics (PangoFont        *font,
 
   font->klass->get_metrics (font, lang, metrics);
 }
-
-/**
- * pango_font_map_init:
- * @fontmap:    a #PangoFontMap
- *
- * Initialize a #PangoFontMap structure. This should
- * only be called from the "new" routine of code which
- * is implementing  a "subclass" of #PangoFontMap
- */
-void 
-pango_font_map_init (PangoFontMap *fontmap)
-{
-  g_return_if_fail (fontmap != NULL);
-
-  fontmap->ref_count = 1;
-}
-
-/**
- * pango_font_map_ref:
- * @fontmap:    a #PangoFontMap
- *
- * Increase the reference count of a #PangoFontMap.
- */
-void 
-pango_font_map_ref (PangoFontMap *fontmap)
-{
-  g_return_if_fail (fontmap != NULL);
-
-  fontmap->ref_count++;
-}
-
-
-/**
- * pango_font_map_unref:
- * @fontmap: a #PangoFontMap
- *
- * Decrease the reference count of a #PangoFontMap.
- * if the result is zero, destroy the font
- * and free the associated memory.
- */
-void 
-pango_font_map_unref (PangoFontMap *fontmap)
-{
-  g_return_if_fail (fontmap != NULL);
-  g_return_if_fail (fontmap->ref_count > 0);
-  
-  fontmap->ref_count--;
-  if (fontmap->ref_count == 0)
-    fontmap->klass->destroy (fontmap);
-}
-
-/**
- * pango_font_map_load_font:
- * @fontmap: a #PangoFontMap
- * @desc: a #PangoFontDescription describing the font to load
- * 
- * Load the font in the fontmap that is the closest match for @desc.
- *
- * Returns the font loaded, or %NULL if no font matched.
- **/
-PangoFont *
-pango_font_map_load_font  (PangoFontMap               *fontmap,
-			   const PangoFontDescription *desc)
-{
-  g_return_val_if_fail (fontmap != NULL, NULL);
-
-  return fontmap->klass->load_font (fontmap, desc);
-}
-
-/**
- * pango_font_map_list_fonts:
- * @fontmap: a #PangoFontMap
- * @family: the family for which to list the fonts, or %NULL
- *          to list fonts in all families.
- * @descs: location to store a pointer to an array of pointers to
- *         #PangoFontDescription. This array should be freed
- *         with pango_font_descriptions_free().
- * @n_descs: location to store the number of elements in @descs
- * 
- * List all fonts in a fontmap, or the fonts in a particular family.
- **/
-void
-pango_font_map_list_fonts (PangoFontMap           *fontmap,
-			   const char             *family,
-			   PangoFontDescription ***descs,
-			   int                    *n_descs)
-{
-  g_return_if_fail (fontmap != NULL);
-
-  fontmap->klass->list_fonts (fontmap, family, descs, n_descs);
-}
-
-/**
- * pango_font_map_list_families:
- * @fontmap: a #PangoFontMap
- * @families: location to store a pointer to an array of strings.
- *            This array should be freed with pango_font_map_free_families().
- * @n_families: location to store the number of elements in @descs
- * 
- * List all families for a fontmap. 
- **/
-void
-pango_font_map_list_families (PangoFontMap   *fontmap,
-			      gchar        ***families,
-			      int            *n_families)
-{
-  g_return_if_fail (fontmap != NULL);
-
-  fontmap->klass->list_families (fontmap, families, n_families);
-}
-
-/**
- * pango_font_map_free_families:
- * @families: a list of families
- * @n_families: number of elements in @families
- * 
- * Free a list of families returned from pango_font_map_list_families()
- **/
-void
-pango_font_map_free_families (gchar       **families,
-			      int           n_families)
-{
-  int i;
-  
-  g_return_if_fail (n_families == 0 || families != NULL);
-
-  for (i=0; i<n_families; i++)
-    g_free (families[i]);
-
-  g_free (families);
-}