diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-14 19:54:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-14 19:54:19 +0000 |
| commit | 52930d8a275dd6628afdad3dfab8ca362de621a4 (patch) | |
| tree | 226d806136bb8bc75bf3945c043fa77326fcb135 /pango/ellipsize.c | |
| parent | 265c86ac01a154c35de7db3679052087c0b02dd3 (diff) | |
| download | pango-52930d8a275dd6628afdad3dfab8ca362de621a4.tar.gz | |
Chain up from finalize. (#307547, Paolo Borelli)
2005-06-14 Owen Taylor <otaylor@redhat.com>
* pango/opentype/pango-ot-info.c (pango_ot_info_finalize)
pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize):
Chain up from finalize. (#307547, Paolo Borelli)
* pango/opentype/pango-ot-info.c (pango_ot_info_finalizer):
make accidentally public function static.
Diffstat (limited to 'pango/ellipsize.c')
| -rw-r--r-- | pango/ellipsize.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/ellipsize.c b/pango/ellipsize.c index 350d0ca3..39649461 100644 --- a/pango/ellipsize.c +++ b/pango/ellipsize.c @@ -347,14 +347,15 @@ shape_ellipsis (EllipsizeState *state) /* If that fails we use "..." in the first matching font */ - if (!_pango_engine_shape_covers (item->analysis.shape_engine, item->analysis.font, + if (!item->analysis.font || + !_pango_engine_shape_covers (item->analysis.shape_engine, item->analysis.font, item->analysis.language, g_utf8_get_char (ellipsis_text))) { pango_item_free (item); /* Modify the fallback iter while it is inside the PangoAttrList; Don't try this at home */ - ((PangoAttrInt *)fallback)->value = FALSE; + ((PangoAttrInt *)fallback)->value = TRUE; ellipsis_text = "..."; item = itemize_text (state, ellipsis_text, attrs); |