diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 19:46:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 19:46:32 +0000 |
| commit | 4d48d045a04c054c88fa09a578bd66cec54f8d42 (patch) | |
| tree | a7398c7da63396bcb4f45324c09d31428fb916f3 /pango/pango-context.c | |
| parent | a397495f91e6aa3455264cd122f5628a49c44b9c (diff) | |
| download | pango-4d48d045a04c054c88fa09a578bd66cec54f8d42.tar.gz | |
Initialize state->lang from context->language if not otherwise set.
Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (update_attr_iterator): Initialize
state->lang from context->language if not otherwise set.
Without doing this, the default language tag was, not
suprisingly, having no effect! (#137334, Frederic Zhang)
* pango/pango-attributes.c (pango_attr_iterator_get_font):
Fix typo in doc comment.
Diffstat (limited to 'pango/pango-context.c')
| -rw-r--r-- | pango/pango-context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index ea5dd83e..5f0ec379 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -619,6 +619,9 @@ update_attr_iterator (ItemizeState *state) &state->lang, &state->extra_attrs); state->copy_extra_attrs = FALSE; + if (!state->lang) + state->lang = state->context->language; + fallback = find_attribute (state->extra_attrs, PANGO_ATTR_FALLBACK); state->enable_fallback = (fallback == NULL || ((PangoAttrInt *)fallback)->value); |