diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 15:37:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 15:37:13 +0000 |
| commit | 55701c4f54b35427d203ed937e76bcb533e1cc92 (patch) | |
| tree | d536ca5d8b925a589b27d396e7cd21d4424b48f1 | |
| parent | 3d3e0fc8f7aba66ab41abfad152ea42e8fac8b36 (diff) | |
| download | pango-55701c4f54b35427d203ed937e76bcb533e1cc92.tar.gz | |
Revert the last change, assert that initialization succeeded.
Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new):
Revert the last change, assert that initialization
succeeded.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 10 |
5 files changed, 26 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): + Revert the last change, assert that initialization + succeeded. + Mon Jun 21 11:29:39 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 23bdf548..1f0694c7 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): + Revert the last change, assert that initialization + succeeded. + Mon Jun 21 11:29:39 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 23bdf548..1f0694c7 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): + Revert the last change, assert that initialization + succeeded. + Mon Jun 21 11:29:39 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 23bdf548..1f0694c7 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): + Revert the last change, assert that initialization + succeeded. + Mon Jun 21 11:29:39 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_font_map_new): diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 6bc1936c..4d4c7a57 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -136,8 +136,7 @@ pango_ft2_font_map_finalize (GObject *object) if (ft2fontmap->substitute_destroy) ft2fontmap->substitute_destroy (ft2fontmap->substitute_data); - if (ft2fontmap->library) - FT_Done_FreeType (ft2fontmap->library); + FT_Done_FreeType (ft2fontmap->library); parent_class->finalize (object); } @@ -169,12 +168,7 @@ pango_ft2_font_map_new (void) error = FT_Init_FreeType (&ft2fontmap->library); if (error != FT_Err_Ok) - { - g_warning ("Error from FT_Init_FreeType: %s", - _pango_ft2_ft_strerror (error)); - g_object_unref (ft2fontmap); - return NULL; - } + g_error ("pango_ft2_font_map_new: Could not initialize freetype"); return (PangoFontMap *)ft2fontmap; } |