If locking font face failed, do not assert, just return zero glyphs with

2006-01-29  Behdad Esfahbod  <behdad@gnome.org>

        * modules/arabic/arabic-fc.c, modules/basic/basic-fc.c
        modules/hebrew/hebrew-fc.c, modules/indic/indic-fc.c
        modules/khmer/khmer-fc.c, modules/syriac/syriac-fc.c
        modules/thai/thai-ot.c, modules/thai/thai-shaper.c
        modules/tibetan/tibetan-fc.c: If locking font face failed,
        do not assert, just return zero glyphs with an implicit
        warning.

        * pango/fonts.c, pango/glyphstring.c pango/modules.c
        pango/pango-color.c, pango/pango-context.c
        pango/pango-coverage.c, pango/pango-fontmap.c
        pango/pango-glyph-item.c, pango/pango-item.c
        pango/pango-layout.c, pango/pango-markup.c
        pango/pango-ot-buffer.c, pango/pango-script.c
        pango/pango-tabs.c, pango/pango-utils.c
        pango/pangoatsui-fontmap.c, pango/pangocairo-fcfont.c
        pango/pangocairo-fcfontmap.c, pango/pangocairo-fontmap.c
        pango/pangocairo-win32font.c, pango/pangofc-font.c
        pango/pangofc-fontmap.c, pango/pangoft2-fontmap.c
        pango/pangoft2-render.c, pango/pangoft2.c
        pango/pangowin32-fontcache.c, pango/pangoxft-font.c
        pango/pangoxft-render.c, pango/break.c pango/ellipsize.c:
        Use g_slice for allocating all types.  Also, change some
        g_error's to g_critical's...

1 files changed, 6 insertions, 6 deletions

diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index a5128f3e..73e980bb 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -191,7 +191,7 @@ open_tag_free (OpenTag *ot)
 {
   g_slist_foreach (ot->attrs, (GFunc) pango_attribute_destroy, NULL);
   g_slist_free (ot->attrs);
-  g_free (ot);
+  g_slice_free (OpenTag, ot);
 }
 
 static void
@@ -226,7 +226,7 @@ markup_data_open_tag (MarkupData   *md)
   if (md->tag_stack)
     parent = md->tag_stack->data;
   
-  ot = g_new (OpenTag, 1);
+  ot = g_slice_new (OpenTag);
   ot->attrs = NULL;
   ot->start_index = md->index;
   ot->scale_level_delta = 0;
@@ -315,7 +315,7 @@ markup_data_close_tag (MarkupData *md)
     }
   
   g_slist_free (ot->attrs);
-  g_free (ot);  
+  g_slice_free (OpenTag, ot);  
 }
 
 static void
@@ -591,7 +591,7 @@ pango_parse_markup (const char                 *markup_text,
   
   g_return_val_if_fail (markup_text != NULL, FALSE);
   
-  md = g_new (MarkupData, 1);
+  md = g_slice_new (MarkupData);
 
   /* Don't bother creating these if they weren't requested;
    * might be useful e.g. if you just want to validate
@@ -686,7 +686,7 @@ pango_parse_markup (const char                 *markup_text,
   
   g_assert (md->tag_stack == NULL);
   
-  g_free (md);
+  g_slice_free (MarkupData, md);
 
   return TRUE;
 
@@ -700,7 +700,7 @@ pango_parse_markup (const char                 *markup_text,
   if (md->attr_list)
     pango_attr_list_unref (md->attr_list);
 
-  g_free (md);
+  g_slice_free (MarkupData, md);
 
   if (context)
     g_markup_parse_context_free (context);