diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | modules/Makefile.am | 3 | ||||
| -rw-r--r-- | pango/pango-fontmap.c | 5 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 8 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 4 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 4 |
6 files changed, 22 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2006-01-27 Behdad Esfahbod <behdad@gnome.org> + + * modules/Makefile.am: Remove pango.modules on uninstall. (bug #328869) + + * pango/pango-fontmap.c, pango/pangocairo-*font.c: Better error + messages. + 2006-01-26 Behdad Esfahbod <behdad@gnome.org> * pango/pangoatsui-fontmap.c: #include <modules.h>. (bug #328632) diff --git a/modules/Makefile.am b/modules/Makefile.am index 89b9ccf4..a9ffbfbe 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -42,6 +42,9 @@ install-data-local: $(top_builddir)/pango/pango-querymodules echo "***" ; \ fi +uninstall-local: + $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules + pango.modules: $(top_builddir)/pango/pango-querymodules $(SUBDIRS) @if find . -name '*.so' | grep 'so' > /dev/null ; then \ echo "Writing a pango.modules file to use with tests/examples."; \ diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index 8a033566..62ffab9e 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -221,10 +221,7 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap, /* Everything failed, we are screwed, there is no way to continue */ if (pango_fontset_simple_size (fonts) == 0) - { - g_warning ("All font failbacks failed!!!!"); - exit (1); - } + g_error ("All font fallbacks failed!!!!"); return PANGO_FONTSET (fonts); } diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index aedc7cb6..e4d0d183 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -88,6 +88,12 @@ pango_cairo_atsui_font_get_font_face (PangoCairoFont *font) if (!cafont->font_face) { cafont->font_face = cairo_atsui_font_face_create_for_atsu_font_id (cafont->font_id); + + /* Failure of the above should only occur for out of memory, + * we can't proceed at that point + */ + if (!cafont->font_face) + g_error ("Unable to create ATSUI cairo font face.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cafont->font_face; @@ -112,7 +118,7 @@ pango_cairo_atsui_font_get_scaled_font (PangoCairoFont *font) * we can't proceed at that point */ if (!cafont->scaled_font) - g_error ("Unable create Cairo font"); + g_error ("Unable to create ATSUI cairo scaled font.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cafont->scaled_font; diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index e5a8b194..fe2a635f 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -137,7 +137,7 @@ pango_cairo_fc_font_get_font_face (PangoCairoFont *font) * we can't proceed at that point */ if (!cffont->font_face) - g_error ("Unable create Cairo font name"); + g_error ("Unable to create FT2 cairo font face.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cffont->font_face; @@ -163,7 +163,7 @@ pango_cairo_fc_font_get_scaled_font (PangoCairoFont *font) * we can't proceed at that point */ if (!cffont->scaled_font) - g_error ("Unable create Cairo font"); + g_error ("Unable to create FT2 cairo scaled font.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cffont->scaled_font; diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 1a48ee9b..9e770691 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -103,7 +103,7 @@ pango_cairo_win32_font_get_font_face (PangoCairoFont *font) * we can't proceed at that point */ if (!cwfont->font_face) - g_error ("Unable create Cairo font"); + g_error ("Unable to create Win32 cairo font face.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cwfont->font_face; @@ -128,7 +128,7 @@ pango_cairo_win32_font_get_scaled_font (PangoCairoFont *font) * we can't proceed at that point */ if (!cwfont->scaled_font) - g_error ("Unable create Cairo font"); + g_error ("Unable to create Win32 cairo scaled font.\nThis means out of memory or a cairo/fontconfig/FreeType bug"); } return cwfont->scaled_font; |