diff options
author | Sven Neumann <sven@gimp.org> | 2001-10-03 18:28:02 +0000 |
---|---|---|
committer | Sven Neumann <neo@src.gnome.org> | 2001-10-03 18:28:02 +0000 |
commit | fcb2ec7803e96f6dc0f859cebc004dcc75584c89 (patch) | |
tree | bb75c469c3c71d22580e71a41df6fc8372da7c9c /pango | |
parent | 5c3dee45a584a81d800ffc8291b9169af6d790c0 (diff) | |
download | pango-fcb2ec7803e96f6dc0f859cebc004dcc75584c89.tar.gz |
don't include family name if PANGO_FONT_MASK_FAMILY is not set.
2001-10-03 Sven Neumann <sven@gimp.org>
* pango/fonts.c (pango_font_description_to_string): don't include
family name if PANGO_FONT_MASK_FAMILY is not set.
* pango/pangoft2-fontmap.c: make it compile with DEBUGGING being
defined.
Diffstat (limited to 'pango')
-rw-r--r-- | pango/fonts.c | 2 | ||||
-rw-r--r-- | pango/pangoft2-fontmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 1586b4c4..4ace0a19 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -910,7 +910,7 @@ pango_font_description_to_string (const PangoFontDescription *desc) GString *result = g_string_new (NULL); char *str; - if (desc->family_name) + if (desc->family_name && desc->mask & PANGO_FONT_MASK_FAMILY) { const char *p; size_t wordlen; diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 13df4248..8492524f 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -700,7 +700,7 @@ pango_print_desc (PangoFontDescription *desc) PangoStretch stretch = pango_font_description_get_stretch (desc); g_print ("%s%s%s%s%s", - pango_font_get_family (desc), + pango_font_description_get_family (desc), (style == PANGO_STYLE_NORMAL ? "" : (style == PANGO_STYLE_OBLIQUE ? " OBLIQUE" : (style == PANGO_STYLE_ITALIC ? " ITALIC" : " ???"))), |