diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pango-fontmap.c | 1 |
3 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pango-fontmap.c (pango_font_map_load_font): Add + a g_return_if_fail() if desc doesn't have a family. + (#165866, Kees Cook) + +2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): Call XftCharIndex() on the right font. (#163511) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d7dc41d0..dffaf079 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,11 @@ 2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pango-fontmap.c (pango_font_map_load_font): Add + a g_return_if_fail() if desc doesn't have a family. + (#165866, Kees Cook) + +2005-03-03 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs): Call XftCharIndex() on the right font. (#163511) diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index c94e1a24..80fcfbd3 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -58,6 +58,7 @@ pango_font_map_load_font (PangoFontMap *fontmap, const PangoFontDescription *desc) { g_return_val_if_fail (fontmap != NULL, NULL); + g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL); return PANGO_FONT_MAP_GET_CLASS (fontmap)->load_font (fontmap, context, desc); } |