diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-02-19 23:28:34 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-19 23:28:34 +0000 |
| commit | 3c1ef3b659b2ffdb9613c8d2d330b64dc1fd0963 (patch) | |
| tree | ce13eb70dc174ef55517a9b59332348f52b63d1b /pango | |
| parent | bf301cab40984ec2997f86a2e220a5247cd0c833 (diff) | |
| download | pango-3c1ef3b659b2ffdb9613c8d2d330b64dc1fd0963.tar.gz | |
Fix problem where charsets specified in alias files where being ignored
Sat Feb 19 18:51:35 2000 Owen Taylor <otaylor@redhat.com>
* libpango/pangox.c (pango_x_make_matching_xlfd): Fix problem
where charsets specified in alias files where being ignored
and treated as wildcards.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pangox.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pango/pangox.c b/pango/pangox.c index 80b18395..7fe21994 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -1590,14 +1590,23 @@ pango_x_make_matching_xlfd (PangoXFontMap *xfontmap, char *xlfd, const char *cha char *dash_charset; + dash_charset = g_strconcat ("-", charset, NULL); + + if (!match_end (xlfd, "-*-*") && !match_end (xlfd, dash_charset)) + { + g_free (dash_charset); + return NULL; + } + identifier = pango_x_get_identifier (xlfd); size_info = g_hash_table_lookup (xfontmap->size_infos, identifier); g_free (identifier); if (!size_info) - return NULL; - - dash_charset = g_strconcat ("-", charset, NULL); + { + g_free (dash_charset); + return NULL; + } tmp_list = size_info->xlfds; while (tmp_list) |