diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-11-03 03:33:10 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-11-03 03:33:10 +0000 |
| commit | af4e1ec94ff91603dfc093035455513576e5228c (patch) | |
| tree | 66caa5daf7bd0b13e3f44463706b6635dedab201 | |
| parent | 6b36f3fc585a7c5c7d6ad40e29600edd3c656748 (diff) | |
| download | pango-af4e1ec94ff91603dfc093035455513576e5228c.tar.gz | |
Accept also a quoted string for the left-hand side of an aliases file
2007-11-02 Tor Lillqvist <tml@novell.com>
* pango/pango-utils.c (read_alias_file): Accept also a quoted
string for the left-hand side of an aliases file line. This is to
enable aliasing fonts with spaces in their name, like "Segoe UI"
which is the default system font on Vista. (#492504)
svn path=/branches/pango-1-18/; revision=2490
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pango/pango-utils.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-11-02 Tor Lillqvist <tml@novell.com> + + * pango/pango-utils.c (read_alias_file): Accept also a quoted + string for the left-hand side of an aliases file line. This is to + enable aliasing fonts with spaces in their name, like "Segoe UI" + which is the default system font on Vista. (#492504) + 2007-10-26 Murray Cumming <murrayc@murrayc.com> * docs/pango_markup.sgml: Adds a link to diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 47b402b7..2333dae3 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -512,6 +512,7 @@ pango_scan_string (const char **pos, GString *out) gboolean pango_scan_int (const char **pos, int *out) { + unsigned int i = 0; char *end; long temp; @@ -1273,7 +1274,7 @@ read_alias_file (const char *filename) if (!pango_skip_space (&pos)) continue; - if (!pango_scan_word (&pos, tmp_buffer1) || + if (!pango_scan_string (&pos, tmp_buffer1) || !pango_skip_space (&pos)) { errstring = g_strdup ("Line is not of the form KEY=VALUE or KEY+=VALUE"); |